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