Arthur Lutz
f3ef626ec4
[users.sls] touch /etc/nginx/.htpasswd
7 years ago
Andres Montalban
cb938864f1
Merge remote-tracking branch 'upstream/master'
7 years ago
Niels Abspoel
896fdee0dd
Merge pull request #176 from Perceptyx/fix_pr_172
Fix for PR #172
7 years ago
Andres Montalban
52015ae160
Merge branch 'fix_pr_172'
7 years ago
Andres Montalban
ac90a9f07b
Fix for saltstack-formulas/nginx-formula/#172
7 years ago
Niels Abspoel
dc292fb780
Merge pull request #175 from 9numbernine9/fix-dhparam-default
Add default value when calling pillar.get on nginx:ng:dhparam
7 years ago
Matt M
19d0102c2e
Ensure that pillar.get on nginx:ng:dhparam has a sane
default value if dhparam isn't defined in the pillar.
7 years ago
Niels Abspoel
1db6ddeb66
Merge pull request #82 from devaos/master
Allow debug symbols to be included when compiling from source
7 years ago
Niels Abspoel
4204505489
Merge pull request #153 from EvaSDK/add_dhparam_creation
Add dhparam creation
7 years ago
Niels Abspoel
1b616bf3fc
Merge pull request #171 from Perceptyx/master
Add support for FreeBSD
7 years ago
Andres Montalban
73899178fc
Remove trailing spaces
7 years ago
Andres Montalban
7e259ebdd4
Add support for FreeBSD
7 years ago
David Seira
69e9b47baf
Merge pull request #168 from dseira/master
New Feature/Improvement - Added deleted option to be able to remove site files
7 years ago
David Seira
6090ce0772
Merge pull request #167 from jamesp9/master
update README, closes #121
7 years ago
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)
7 years ago
james pinkster
f7fb8e3925
update README, closes #121
7 years ago
David Seira
56137629a6
Merge pull request #166 from dseira/master
New feature - Enable the uploading of the config files
7 years ago
David Seira
60b5c732d7
Fix in config.sls with the new naming for source_path
7 years ago
David Seira
8c0259c593
Replace source for source_path variable name in nginx.conf file
7 years ago
David Seira
bc7f8f4970
Replace source for source_path variable name
7 years ago
David Seira
1f697b9d6b
New feature - Enable the uploading of the config file (nginx.conf and sites) instead of templating those file
7 years ago
myoung34
bc71df50a9
Merge pull request #165 from saltstack-formulas/pillar-example
Updated pillar.example file with distro learnings
7 years ago
Noel McLoughlin
433bda5671
Additional explanatory comments for pillar.example
7 years ago
Noel McLoughlin
2e03d4c17d
Updated pillar.example file with installation learnings (OpenSUSE, Ubuntu, Fedora)
7 years ago
Niels Abspoel
ec561b2839
Merge pull request #164 from saltstack-formulas/susefix
Fix for OpenSuse leap, salt 2016.3.4-84.13
7 years ago
Noel McLoughlin
6b09358838
Fix for OpenSuse leap, salt 2016.3.4-84.13
7 years ago
Gilles Dartiguelongue
43c4eca3bb
Add missing dependency on nginx_service
7 years ago
Gilles Dartiguelongue
d2bc1e6d7c
Add support for specifying dh_param file name
7 years ago
Gilles Dartiguelongue
db2db31300
Handle installation of openssl to generate DH param
7 years ago
Gilles Dartiguelongue
19ab90ebb5
Add example for DH management
7 years ago
Tobias Macey
9ab4e3f411
Added dhparam file creation
In order to improve security and ease of use, added creation/generation
of dhparam file.
8 years ago
Niels Abspoel
07d06079bc
Merge pull request #163 from Perceptyx/cert_path_configurable
Make certificates path configurable.
7 years ago
abednarik
57011ba3bf
Make certificates path configurable.
7 years ago
Niels Abspoel
d938725d2c
Merge pull request #160 from netmanagers/master
Fix missing defaults when no `install_from_*` is set
7 years ago
Javier Bértoli
0be21dff4c
Fix missing defaults when no `install_from_*` is set
7 years ago
Niels Abspoel
9f5f966f7e
Merge pull request #158 from netmanagers/master
Add support to install phusion passenger in the `ng`
7 years ago
Javier Bértoli
a656014934
Update the README
7 years ago
Javier Bértoli
79ddb497d0
Add support to install and configure passenger
7 years ago
Javier Bértoli
240bd8348a
Merge pull request #157 from SuperTux88/nginx-conf-include
Move includes to the top of nginx.conf
7 years ago
Benjamin Neff
5d67b09594
Move includes to the top of nginx.conf
7 years ago
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 years ago
J. Eduardo
fb818fc4cd
Fixed reference to pkg state when installing from official Debian repo
7 years ago
francesco.a
630a522ba4
Disabled automatic sorting of mapping keys in jinja templating
7 years ago
Niels Abspoel
c6f230f43a
Merge pull request #146 from myoung34/bugfix/upstart_runlevel
Fixed runlevel on nginx upstart file
8 years ago
Marcus Young
2509f0d7bf
Fixed runlevel on nginx upstart file
8 years ago
Niels Abspoel
6512516154
Merge pull request #141 from chris-sanders/chris
Use oscodename instead of hard coded trusty for deb
8 years ago
Chris Sanders
ce2e8ea03b
Cleaned up comment
Removed comment after testing that this change works with xenial
8 years ago
Forrest
a59ca4c26c
Merge pull request #140 from scub/nginx_old_init_onlyif_exists
nginx/package: add onlyif requisite to nginx-old-init
8 years ago
Skoobie
571eb2908d
nginx/package: add onlyif requisite to nginx-old-init
8 years ago
Forrest
545944cf7f
Merge pull request #137 from arthurlogilab/patch-2
add depenency to salt-contrib's basicauth
8 years ago