Commit Graph

175 Commits

Author SHA1 Message Date
Alexandre Anriot
b2c07443ca Allow installation of multiple packages 2018-10-19 16:15:01 +02:00
Konrad Mosoń
f16d800c83
Allow to use load_module without including external files 2018-05-08 19:13:03 +02:00
Niels Abspoel
4b3d5bf624
Merge pull request #190 from arthurlogilab/nginx-users-makedirs
[nginx/users] convert file.present into file.managed with no content
2018-04-24 12:26:58 +02:00
Arthur Lutz
4da13b9f8b [nginx/users] convert file.present into file.managed with no content 2018-04-24 11:20:08 +02:00
Niels Abspoel
5a7e113a15
Merge pull request #189 from arthurlogilab/nginx-users-makedirs
[nginx/users] add makedirs to htpasswd deploy
2018-04-24 11:02:25 +02:00
Arthur Lutz
28d1069617 [nginx/users] add makedirs to htpasswd deploy 2018-04-24 11:01:29 +02:00
Niels Abspoel
d0800e9aac
Merge pull request #183 from arthurlogilab/patch-4
Touch htpassw for nginx
2018-03-18 21:13:08 +01:00
Javier Bértoli
c5c1047865 Allow to specify a different passenger config file in nginx.ng 2018-02-13 21:27:15 -03:00
Arthur Lutz
78ddf90f5b
[users] use {{ htauth }} variable 2018-01-24 16:56:43 +01:00
Arthur Lutz
f3ef626ec4
[users.sls] touch /etc/nginx/.htpasswd 2018-01-24 16:44:51 +01:00
Andres Montalban
ac90a9f07b Fix for saltstack-formulas/nginx-formula/#172 2017-12-22 10:33:23 -03:00
Matt M
19d0102c2e Ensure that pillar.get on nginx🆖dhparam has a sane
default value if dhparam isn't defined in the pillar.
2017-12-20 22:31:49 -05:00
Niels Abspoel
1db6ddeb66
Merge pull request #82 from devaos/master
Allow debug symbols to be included when compiling from source
2017-12-16 09:27:26 +01:00
Niels Abspoel
4204505489
Merge pull request #153 from EvaSDK/add_dhparam_creation
Add dhparam creation
2017-12-16 09:26:20 +01:00
Andres Montalban
73899178fc Remove trailing spaces 2017-12-12 17:10:51 -03:00
Andres Montalban
7e259ebdd4 Add support for FreeBSD 2017-12-12 17:08:06 -03:00
David Seira
f50c7e27e1 New Feature - Added deleted option to be able to remove site files (clean up sites folder)
Improvement - Disable reload of nginx when enabled=False (previously the nginx was always reloaded if settings.config != None; even with enabled=False)
2017-09-01 11:23:15 +02:00
David Seira
60b5c732d7 Fix in config.sls with the new naming for source_path 2017-08-31 13:36:10 +02:00
David Seira
8c0259c593 Replace source for source_path variable name in nginx.conf file 2017-08-31 13:22:55 +02:00
David Seira
bc7f8f4970 Replace source for source_path variable name 2017-08-31 13:19:46 +02:00
David Seira
1f697b9d6b New feature - Enable the uploading of the config file (nginx.conf and sites) instead of templating those file 2017-08-30 19:48:44 +02:00
Noel McLoughlin
6b09358838 Fix for OpenSuse leap, salt 2016.3.4-84.13 2017-08-24 10:52:59 +01:00
Gilles Dartiguelongue
43c4eca3bb Add missing dependency on nginx_service 2017-08-18 11:53:06 +02:00
Gilles Dartiguelongue
d2bc1e6d7c Add support for specifying dh_param file name 2017-08-18 11:53:02 +02:00
Gilles Dartiguelongue
db2db31300 Handle installation of openssl to generate DH param 2017-08-18 11:47:20 +02:00
Tobias Macey
9ab4e3f411 Added dhparam file creation
In order to improve security and ease of use, added creation/generation
of dhparam file.
2017-08-18 11:47:11 +02:00
abednarik
57011ba3bf Make certificates path configurable. 2017-07-31 17:20:30 -03:00
Javier Bértoli
0be21dff4c Fix missing defaults when no install_from_* is set 2017-06-26 13:10:44 -03:00
Javier Bértoli
79ddb497d0 Add support to install and configure passenger 2017-06-24 10:43:25 -03:00
Benjamin Neff
5d67b09594
Move includes to the top of nginx.conf 2017-06-18 21:09:05 +02:00
J. Eduardo
fb818fc4cd Fixed reference to pkg state when installing from official Debian repo 2017-04-21 23:29:14 +02: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
Skoobie
571eb2908d nginx/package: add onlyif requisite to nginx-old-init 2016-12-01 16:56:15 -05:00
Arthur Lutz
7cf3af2972 touch htpasswd file if it doesn't exist
Fixes #70
2016-11-16 11:18:15 +01: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
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
Arthur Lutz
727826d272 avoid crash if private_key is not shipped in pillar 2016-10-12 10:52:17 +02:00
Dmitry S. Fedorov
36f4f59624 Add newline to blocks like location, server, httpd and etc 2016-06-29 17:55:54 +03: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
George Robinson
f4bd172adc Fix state fail when NGINX is already installed 2016-06-22 11:09:05 +01: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