David Seira
69e9b47baf
Merge pull request #168 from dseira/master
New Feature/Improvement - Added deleted option to be able to remove site files
pirms 7 gadiem
David Seira
6090ce0772
Merge pull request #167 from jamesp9/master
update README, closes #121
pirms 7 gadiem
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)
pirms 7 gadiem
james pinkster
f7fb8e3925
update README, closes #121
pirms 7 gadiem
David Seira
56137629a6
Merge pull request #166 from dseira/master
New feature - Enable the uploading of the config files
pirms 7 gadiem
David Seira
60b5c732d7
Fix in config.sls with the new naming for source_path
pirms 7 gadiem
David Seira
8c0259c593
Replace source for source_path variable name in nginx.conf file
pirms 7 gadiem
David Seira
bc7f8f4970
Replace source for source_path variable name
pirms 7 gadiem
David Seira
1f697b9d6b
New feature - Enable the uploading of the config file (nginx.conf and sites) instead of templating those file
pirms 7 gadiem
myoung34
bc71df50a9
Merge pull request #165 from saltstack-formulas/pillar-example
Updated pillar.example file with distro learnings
pirms 7 gadiem
Noel McLoughlin
433bda5671
Additional explanatory comments for pillar.example
pirms 7 gadiem
Noel McLoughlin
2e03d4c17d
Updated pillar.example file with installation learnings (OpenSUSE, Ubuntu, Fedora)
pirms 7 gadiem
Niels Abspoel
ec561b2839
Merge pull request #164 from saltstack-formulas/susefix
Fix for OpenSuse leap, salt 2016.3.4-84.13
pirms 7 gadiem
Noel McLoughlin
6b09358838
Fix for OpenSuse leap, salt 2016.3.4-84.13
pirms 7 gadiem
Niels Abspoel
07d06079bc
Merge pull request #163 from Perceptyx/cert_path_configurable
Make certificates path configurable.
pirms 7 gadiem
abednarik
57011ba3bf
Make certificates path configurable.
pirms 7 gadiem
Niels Abspoel
d938725d2c
Merge pull request #160 from netmanagers/master
Fix missing defaults when no `install_from_*` is set
pirms 7 gadiem
Javier Bértoli
0be21dff4c
Fix missing defaults when no `install_from_*` is set
pirms 7 gadiem
Niels Abspoel
9f5f966f7e
Merge pull request #158 from netmanagers/master
Add support to install phusion passenger in the `ng`
pirms 7 gadiem
Javier Bértoli
a656014934
Update the README
pirms 7 gadiem
Javier Bértoli
79ddb497d0
Add support to install and configure passenger
pirms 7 gadiem
Javier Bértoli
240bd8348a
Merge pull request #157 from SuperTux88/nginx-conf-include
Move includes to the top of nginx.conf
pirms 7 gadiem
Benjamin Neff
5d67b09594
Move includes to the top of nginx.conf
pirms 7 gadiem
Javier Bértoli
15a1291495
Merge pull request #152 from jeduardo/pkg_install_fix
Fixed reference to pkg state when installing from official Debian repo
pirms 7 gadiem
J. Eduardo
fb818fc4cd
Fixed reference to pkg state when installing from official Debian repo
pirms 7 gadiem
Niels Abspoel
c6f230f43a
Merge pull request #146 from myoung34/bugfix/upstart_runlevel
Fixed runlevel on nginx upstart file
pirms 7 gadiem
Marcus Young
2509f0d7bf
Fixed runlevel on nginx upstart file
pirms 7 gadiem
Niels Abspoel
6512516154
Merge pull request #141 from chris-sanders/chris
Use oscodename instead of hard coded trusty for deb
pirms 7 gadiem
Chris Sanders
ce2e8ea03b
Cleaned up comment
Removed comment after testing that this change works with xenial
pirms 7 gadiem
Forrest
a59ca4c26c
Merge pull request #140 from scub/nginx_old_init_onlyif_exists
nginx/package: add onlyif requisite to nginx-old-init
pirms 8 gadiem
Skoobie
571eb2908d
nginx/package: add onlyif requisite to nginx-old-init
pirms 8 gadiem
Forrest
545944cf7f
Merge pull request #137 from arthurlogilab/patch-2
add depenency to salt-contrib's basicauth
pirms 8 gadiem
Forrest
99b6ee9976
Merge pull request #138 from arthurlogilab/patch-3
touch htpasswd file if it doesn't exist
pirms 8 gadiem
Arthur Lutz
7cf3af2972
touch htpasswd file if it doesn't exist
Fixes #70
pirms 8 gadiem
Arthur Lutz
cd2276b596
add depenency to salt-contrib's basicauth
pirms 8 gadiem
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
pirms 8 gadiem
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
pirms 8 gadiem
Forrest
26183bc14b
Merge pull request #134 from renich/vhost_to_server
Replace the term vhost for server everywhere and solve issue #105
pirms 8 gadiem
Renich Bon Ciric
92a8461ab3
replace the term vhost for server everywhere
pirms 8 gadiem
Chris Sanders
4900d96a29
Use oscodename grain instead of hard coded trusty
pirms 8 gadiem
Forrest
9e47729230
Merge pull request #131 from arthurlogilab/patch-1
avoid crash if private_key is not shipped in pillar
pirms 8 gadiem
Arthur Lutz
727826d272
avoid crash if private_key is not shipped in pillar
pirms 8 gadiem
Niels Abspoel
ef8fb87105
Merge pull request #125 from fedusia/master
Add newline to blocks like location, server, httpd and etc
pirms 8 gadiem
Dmitry S. Fedorov
36f4f59624
Add newline to blocks like location, server, httpd and etc
pirms 8 gadiem
Forrest
5e4575d702
Merge pull request #124 from grobinson-blockchain/master
Fix overwrite check testing the name of the vhost rather than setting…
pirms 8 gadiem
George Robinson
38c7c8a772
Fix overwrite check testing the name of the vhost rather than settings dict
pirms 8 gadiem
Forrest
06fb1d666f
Merge pull request #123 from grobinson-blockchain/master
Fix state fail when NGINX is already installed
pirms 8 gadiem
George Robinson
f4bd172adc
Fix state fail when NGINX is already installed
pirms 8 gadiem
Forrest
a35b606d9c
Merge pull request #119 from grobinson-blockchain/master
Auto-restart NGINX and use pillars to set conf path when building from source
pirms 8 gadiem
George Robinson
0dcd4feb28
Use NGINX lookup conf path or fallback
pirms 8 gadiem