Javier Bértoli
240bd8348a
Merge pull request #157 from SuperTux88/nginx-conf-include
Move includes to the top of nginx.conf
7 years ago
Benjamin Neff
5d67b09594
Move includes to the top of nginx.conf
7 years ago
Javier Bértoli
15a1291495
Merge pull request #152 from jeduardo/pkg_install_fix
Fixed reference to pkg state when installing from official Debian repo
7 years ago
J. Eduardo
fb818fc4cd
Fixed reference to pkg state when installing from official Debian repo
7 years ago
Niels Abspoel
c6f230f43a
Merge pull request #146 from myoung34/bugfix/upstart_runlevel
Fixed runlevel on nginx upstart file
7 years ago
Marcus Young
2509f0d7bf
Fixed runlevel on nginx upstart file
7 years ago
Niels Abspoel
6512516154
Merge pull request #141 from chris-sanders/chris
Use oscodename instead of hard coded trusty for deb
7 years ago
Chris Sanders
ce2e8ea03b
Cleaned up comment
Removed comment after testing that this change works with xenial
7 years ago
Forrest
a59ca4c26c
Merge pull request #140 from scub/nginx_old_init_onlyif_exists
nginx/package: add onlyif requisite to nginx-old-init
8 years ago
Skoobie
571eb2908d
nginx/package: add onlyif requisite to nginx-old-init
8 years ago
Forrest
545944cf7f
Merge pull request #137 from arthurlogilab/patch-2
add depenency to salt-contrib's basicauth
8 years ago
Forrest
99b6ee9976
Merge pull request #138 from arthurlogilab/patch-3
touch htpasswd file if it doesn't exist
8 years ago
Arthur Lutz
7cf3af2972
touch htpasswd file if it doesn't exist
Fixes #70
8 years ago
Arthur Lutz
cd2276b596
add depenency to salt-contrib's basicauth
8 years ago
Forrest
3c6f0e343e
Merge pull request #135 from aboe76/nginx_ng_listen
change watch to listen so it will only trigger a refresh of the service at the end
8 years ago
Niels Abspoel
ce2024df4b
change service watch to listen so it will only trigger a refresh of nginx service and the end of the state run
8 years ago
Forrest
26183bc14b
Merge pull request #134 from renich/vhost_to_server
Replace the term vhost for server everywhere and solve issue #105
8 years ago
Renich Bon Ciric
92a8461ab3
replace the term vhost for server everywhere
8 years ago
Chris Sanders
4900d96a29
Use oscodename grain instead of hard coded trusty
8 years ago
Forrest
9e47729230
Merge pull request #131 from arthurlogilab/patch-1
avoid crash if private_key is not shipped in pillar
8 years ago
Arthur Lutz
727826d272
avoid crash if private_key is not shipped in pillar
8 years ago
Niels Abspoel
ef8fb87105
Merge pull request #125 from fedusia/master
Add newline to blocks like location, server, httpd and etc
8 years ago
Dmitry S. Fedorov
36f4f59624
Add newline to blocks like location, server, httpd and etc
8 years ago
Forrest
5e4575d702
Merge pull request #124 from grobinson-blockchain/master
Fix overwrite check testing the name of the vhost rather than setting…
8 years ago
George Robinson
38c7c8a772
Fix overwrite check testing the name of the vhost rather than settings dict
8 years ago
Forrest
06fb1d666f
Merge pull request #123 from grobinson-blockchain/master
Fix state fail when NGINX is already installed
8 years ago
George Robinson
f4bd172adc
Fix state fail when NGINX is already installed
8 years ago
Forrest
a35b606d9c
Merge pull request #119 from grobinson-blockchain/master
Auto-restart NGINX and use pillars to set conf path when building from source
8 years ago
George Robinson
0dcd4feb28
Use NGINX lookup conf path or fallback
8 years ago
George Robinson
241d8683ed
Overwrite existing vhost files on a per vhost granularity
8 years ago
George Robinson
49e085da11
Use static conf path in compile time options
8 years ago
George Robinson
9ff1a8f22d
vhost_overwrite option for nginx.ng state
8 years ago
George Robinson
6cab66306b
Use conf_file pillar when building from source
8 years ago
George Robinson
c6ed2e6bcb
NGINX zero downtime reloads
8 years ago
George Robinson
6d41a590f8
Auto-restart NGINX on failure
8 years ago
Forrest
d9002d397f
Merge pull request #118 from grobinson-blockchain/master
Build from source with nginx.ng
8 years ago
George Robinson
7f5d36603d
Set /var/log/nginx writable by NGINX worker processes
8 years ago
George Robinson
5c68f12801
Separate NGINX install from source and package states
8 years ago
George Robinson
874719e49e
Fix absent /var/log/nginx
8 years ago
George Robinson
f24b066c43
Build from source with nginx.ng
Build NGINX from source with nginx.ng state with support for passing
compile time flags necessary for installing modules such as more headers
by the openresty project.
8 years ago
Forrest
89d07fed8b
Merge pull request #115 from grobinson-blockchain/master
Fix ppa install for Debian
8 years ago
George Robinson
59bb5abb00
Use trusty packages
8 years ago
George Robinson
6d84de272f
Fix ppa install for Debian
On Ubuntu, you can take advantage of Personal Package Archives on Launchpad simply by specifying the user and archive name. On other apt-based systems this must be the complete entry as it would be seen in the sources.list file.
8 years ago
Forrest
01c713a2da
Merge pull request #114 from M2Mobi/centos
Add lookup index for CentOS
8 years ago
Heinz Wiesinger
dba53b833f
Add lookup index for CentOS
9 years ago
Forrest
dc1e102d57
Merge pull request #112 from bogdanr/master
Support installing the packages from the official repo on Debian
8 years ago
Forrest
a73915879d
Merge pull request #113 from johnnyrun/master
enabled
8 years ago
Gianni Carabelli
91f92164be
enabled
8 years ago
Bogdan Radulescu
3e6b236348
Support installing the packages from the official repo on Debian
8 years ago
puneet kandhari
cf00b46bc8
Merge pull request #108 from enver/master
Added support to control gpgcheck and gpgkey via pillar
8 years ago