Commit Graph

106 Commits

Author SHA1 Message Date
N
cea121299e
Updated for Suse 15.0 2019-02-21 18:16:03 +00:00
Heinz Wiesinger
1541a59c83 Fix multiple values for the same key (include/listen) in server config file.
With this one can now also write

 - include:
   - file1
   - file2

Rather than only

 - include: file1
 - include: file2
2019-02-19 09:26:15 +01:00
Niels Abspoel
a1220edb36
Merge pull request #209 from noelmcloughlin/fixes6
Fix sites-available bug in formula logic
2019-01-25 21:50:40 +01:00
N
2356b4a989
Fix bug related to #188 2019-01-25 19:20:58 +00:00
Niels Abspoel
14572a1c3a
Merge pull request #128 from ghost/master
Fix build deps for NGINX NG build from source
2019-01-25 20:04:07 +01:00
Niels Abspoel
bd9fb88eee
Merge pull request #205 from noelmcloughlin/master
makedirs needed for 'available_dir' pillar
2019-01-25 19:51:56 +01:00
Niels Abspoel
2a97b07084
Merge pull request #206 from noelmcloughlin/fixes2
Fix #182 bug
2019-01-25 19:50:54 +01:00
Niels Abspoel
60b8e74bc0
Merge pull request #207 from noelmcloughlin/fixes3
Enforce PPA's on Ubuntu(s) only; not Debian
2019-01-25 19:50:23 +01:00
N
b6dc52444c
Enforce PPA's on Ubuntu(s) only; not Debian 2019-01-25 15:09:13 +00:00
N
e5b96c169e
Fix #182 2019-01-25 13:25:11 +00:00
N
86f0ae93eb
makedirs is important for 'available_dir' pillar 2019-01-23 22:56:22 +00:00
N
5ca0ef2446
Merge branch 'master' into unsorted_context_mappings 2019-01-23 20:16:00 +00:00
N
698f7cc724
Merge pull request #177 from Perceptyx/fix_config_require
Servers config should require available/enabled dirs
2019-01-23 20:09:15 +00:00
Niels Abspoel
355a968a2b
Merge pull request #197 from MEschenbacher/pillarcert
deploy certificates directly from pillar
2018-10-20 20:19:56 +02:00
Fabian Schlager
3125f9dbcc Add support for snippets 2018-10-20 16:29:13 +02:00
Alexandre Anriot
b2c07443ca Allow installation of multiple packages 2018-10-19 16:15:01 +02:00
Maximilian Eschenbacher
cb030b04ac deploy certificates directly from pillar
... by providing a pillar string. I developed this for use in
combination with ext_pillar and file_tree to deploy letsencrypt
certificates.
2018-10-04 16:26:37 +02:00
Konrad Mosoń
f16d800c83
Allow to use load_module without including external files 2018-05-08 19:13:03 +02:00
Andres Montalban
7a71b09da5 Merge remote-tracking branch 'upstream/master' into fix_config_require 2018-04-26 16:00:02 -03:00
Andres Montalban
dabbc99cc1 Servers config should require available/enabled dirs 2018-04-26 15:59:49 -03:00
Javier Bértoli
c5c1047865 Allow to specify a different passenger config file in nginx.ng 2018-02-13 21:27:15 -03: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
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
francesco.a
630a522ba4 Disabled automatic sorting of mapping keys in jinja templating 2017-03-23 18:54:16 +01: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
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
George Robinson
e4759f559b Fix build deps for NGINX NG build from source 2016-08-10 22:51:36 +01:00
Dmitry S. Fedorov
36f4f59624 Add newline to blocks like location, server, httpd and etc 2016-06-29 17:55:54 +03:00