Niels Abspoel
4204505489
Merge pull request #153 from EvaSDK/add_dhparam_creation
...
Add dhparam creation
2017-12-16 09:26:20 +01:00
Niels Abspoel
1b616bf3fc
Merge pull request #171 from Perceptyx/master
...
Add support for FreeBSD
2017-12-16 09:25:25 +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
69e9b47baf
Merge pull request #168 from dseira/master
...
New Feature/Improvement - Added deleted option to be able to remove site files
2017-09-01 17:41:28 +02:00
David Seira
6090ce0772
Merge pull request #167 from jamesp9/master
...
update README, closes #121
2017-09-01 11:46:27 +02: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
james pinkster
f7fb8e3925
update README, closes #121
2017-09-01 15:43:42 +10:00
David Seira
56137629a6
Merge pull request #166 from dseira/master
...
New feature - Enable the uploading of the config files
2017-08-31 13:36:28 +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
myoung34
bc71df50a9
Merge pull request #165 from saltstack-formulas/pillar-example
...
Updated pillar.example file with distro learnings
2017-08-29 10:38:59 -05:00
Noel McLoughlin
433bda5671
Additional explanatory comments for pillar.example
2017-08-29 14:34:25 +01:00
Noel McLoughlin
2e03d4c17d
Updated pillar.example file with installation learnings (OpenSUSE, Ubuntu, Fedora)
2017-08-28 16:20:58 +01:00
Niels Abspoel
ec561b2839
Merge pull request #164 from saltstack-formulas/susefix
...
Fix for OpenSuse leap, salt 2016.3.4-84.13
2017-08-24 21:48:46 +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
Gilles Dartiguelongue
19ab90ebb5
Add example for DH management
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
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
