Commit Graph

406 Commits

Author SHA1 Message Date
Niels Abspoel
07d06079bc Merge pull request #163 from Perceptyx/cert_path_configurable
Make certificates path configurable.
2017-07-31 23:01:16 +02:00
abednarik
57011ba3bf Make certificates path configurable. 2017-07-31 17:20:30 -03:00
Niels Abspoel
d938725d2c Merge pull request #160 from netmanagers/master
Fix missing defaults when no `install_from_*` is set
2017-06-26 21:38:03 +02:00
Javier Bértoli
0be21dff4c Fix missing defaults when no install_from_* is set 2017-06-26 13:10:44 -03:00
Niels Abspoel
9f5f966f7e Merge pull request #158 from netmanagers/master
Add support to install phusion passenger in the `ng`
2017-06-26 13:19:49 +02:00
Javier Bértoli
a656014934 Update the README 2017-06-24 10:48:17 -03:00
Javier Bértoli
79ddb497d0 Add support to install and configure passenger 2017-06-24 10:43:25 -03:00
Javier Bértoli
240bd8348a Merge pull request #157 from SuperTux88/nginx-conf-include
Move includes to the top of nginx.conf
2017-06-23 17:17:25 -03:00
Benjamin Neff
5d67b09594
Move includes to the top of nginx.conf 2017-06-18 21:09:05 +02:00
Javier Bértoli
15a1291495 Merge pull request #152 from jeduardo/pkg_install_fix
Fixed reference to pkg state when installing from official Debian repo
2017-04-21 18:55:36 -03:00
J. Eduardo
fb818fc4cd Fixed reference to pkg state when installing from official Debian repo 2017-04-21 23:29:14 +02:00
francesco.a
630a522ba4 Disabled automatic sorting of mapping keys in jinja templating 2017-03-23 18:54:16 +01:00
Niels Abspoel
c6f230f43a Merge pull request #146 from myoung34/bugfix/upstart_runlevel
Fixed runlevel on nginx upstart file
2017-01-25 20:20:14 +01:00
Marcus Young
2509f0d7bf Fixed runlevel on nginx upstart file 2017-01-20 13:33:06 -06:00
Niels Abspoel
6512516154 Merge pull request #141 from chris-sanders/chris
Use oscodename instead of hard coded trusty for deb
2017-01-17 21:59:57 +01:00
Chris Sanders
ce2e8ea03b Cleaned up comment
Removed comment after testing that this change works with xenial
2017-01-17 15:11:33 +00:00
Forrest
a59ca4c26c Merge pull request #140 from scub/nginx_old_init_onlyif_exists
nginx/package: add onlyif requisite to nginx-old-init
2016-12-01 14:12:02 -08:00
Skoobie
571eb2908d nginx/package: add onlyif requisite to nginx-old-init 2016-12-01 16:56:15 -05:00
Forrest
545944cf7f Merge pull request #137 from arthurlogilab/patch-2
add depenency to salt-contrib's basicauth
2016-11-16 09:41:07 -08:00
Forrest
99b6ee9976 Merge pull request #138 from arthurlogilab/patch-3
touch htpasswd file if it doesn't exist
2016-11-16 09:40:49 -08:00
Arthur Lutz
7cf3af2972 touch htpasswd file if it doesn't exist
Fixes #70
2016-11-16 11:18:15 +01:00
Arthur Lutz
cd2276b596 add depenency to salt-contrib's basicauth 2016-11-16 11:10:51 +01:00
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
2016-10-29 15:05:41 -07:00
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 2016-10-29 09:34:28 +02:00
Forrest
26183bc14b Merge pull request #134 from renich/vhost_to_server
Replace the term vhost for server everywhere and solve issue #105
2016-10-24 17:02:26 -07:00
Renich Bon Ciric
92a8461ab3 replace the term vhost for server everywhere 2016-10-19 16:35:38 -05:00
Chris Sanders
4900d96a29 Use oscodename grain instead of hard coded trusty 2016-10-17 11:36:29 -05:00
Forrest
9e47729230 Merge pull request #131 from arthurlogilab/patch-1
avoid crash if private_key is not shipped in pillar
2016-10-12 09:32:09 -07:00
Arthur Lutz
727826d272 avoid crash if private_key is not shipped in pillar 2016-10-12 10:52:17 +02:00
George Robinson
e4759f559b Fix build deps for NGINX NG build from source 2016-08-10 22:51:36 +01:00
Niels Abspoel
ef8fb87105 Merge pull request #125 from fedusia/master
Add newline to blocks like location, server, httpd and etc
2016-06-29 17:04:10 +02:00
Dmitry S. Fedorov
36f4f59624 Add newline to blocks like location, server, httpd and etc 2016-06-29 17:55:54 +03:00
Forrest
5e4575d702 Merge pull request #124 from grobinson-blockchain/master
Fix overwrite check testing the name of the vhost rather than setting…
2016-06-22 10:23:00 -07:00
George Robinson
38c7c8a772 Fix overwrite check testing the name of the vhost rather than settings dict 2016-06-22 18:22:01 +01:00
Forrest
06fb1d666f Merge pull request #123 from grobinson-blockchain/master
Fix state fail when NGINX is already installed
2016-06-22 09:49:54 -07:00
George Robinson
f4bd172adc Fix state fail when NGINX is already installed 2016-06-22 11:09:05 +01:00
Forrest
a35b606d9c Merge pull request #119 from grobinson-blockchain/master
Auto-restart NGINX and use pillars to set conf path when building from source
2016-06-05 12:20:00 -07:00
George Robinson
0dcd4feb28 Use NGINX lookup conf path or fallback 2016-06-05 19:35:35 +01:00
George Robinson
241d8683ed Overwrite existing vhost files on a per vhost granularity 2016-06-05 19:34:53 +01:00
George Robinson
49e085da11 Use static conf path in compile time options 2016-05-25 18:24:34 +01:00
George Robinson
9ff1a8f22d vhost_overwrite option for nginx.ng state 2016-05-25 16:53:52 +01:00
George Robinson
6cab66306b Use conf_file pillar when building from source 2016-05-25 12:05:18 +01:00
George Robinson
c6ed2e6bcb NGINX zero downtime reloads 2016-05-25 12:02:43 +01:00
George Robinson
6d41a590f8 Auto-restart NGINX on failure 2016-05-25 11:57:25 +01:00
Forrest
d9002d397f Merge pull request #118 from grobinson-blockchain/master
Build from source with nginx.ng
2016-05-10 09:50:58 -07:00
George Robinson
7f5d36603d Set /var/log/nginx writable by NGINX worker processes 2016-05-10 12:06:42 +01:00
George Robinson
5c68f12801 Separate NGINX install from source and package states 2016-05-10 12:00:18 +01:00
George Robinson
874719e49e Fix absent /var/log/nginx 2016-05-09 17:59:55 +01:00
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.
2016-05-09 16:39:24 +01:00
Forrest
89d07fed8b Merge pull request #115 from grobinson-blockchain/master
Fix ppa install for Debian
2016-04-20 09:33:50 -07:00