saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
357 Commits 7 Branches 34 Tags 1.2 MiB
c24d2b64d4
Commit Graph

357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Javier Bértoli
3a5b51940e
Merge pull request #196 from bebosudo/fix_tab_pillar_example 
Replace tabs in pillar.example with spaces.
 2018-09-23 19:04:21 -03:00
Alberto Chiusole
f4b3530e50 Replace tabs in pillar.example with spaces. 
tabs cause salt to trigger a render error because tabs are 'illegal':
```
yaml.scanner.ScannerError: while scanning for the next token
found character '\t' that cannot start any token
  in "<unicode string>", line 33, column 32:
            pid: /var/run/nginx.pid\t\t### Directory location must exist
                                   ^
```
 2018-09-23 23:12:05 +02:00
Niels Abspoel
a5624627dc
Merge pull request #192 from morsik/patch-1 
Allow to use load_module directly
 2018-06-29 12:59:01 +02:00
Konrad Mosoń
c75ad64348
Example for load_module: comment how it works 2018-06-29 12:55:17 +02:00
Konrad Mosoń
9c4634d40a
Example for load_module 2018-06-29 12:46:12 +02:00
Megan
1ba5001b34 Merge branch 'master' into test-harness 2018-05-17 14:40:31 -05: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
Niels Abspoel
4b3d5bf624
Merge pull request #190 from arthurlogilab/nginx-users-makedirs 
[nginx/users] convert file.present into file.managed with no content
 2018-04-24 12:26:58 +02:00
Arthur Lutz
4da13b9f8b [nginx/users] convert file.present into file.managed with no content 2018-04-24 11:20:08 +02:00
Niels Abspoel
5a7e113a15
Merge pull request #189 from arthurlogilab/nginx-users-makedirs 
[nginx/users] add makedirs to htpasswd deploy
 2018-04-24 11:02:25 +02:00
Arthur Lutz
28d1069617 [nginx/users] add makedirs to htpasswd deploy 2018-04-24 11:01:29 +02:00
Niels Abspoel
d0800e9aac
Merge pull request #183 from arthurlogilab/patch-4 
Touch htpassw for nginx
 2018-03-18 21:13:08 +01:00
Niels Abspoel
eeb118bb93
Merge pull request #184 from arthurlogilab/patch-5 
[README] include nginx.ng.certifcates
 2018-03-18 21:12:03 +01:00
Megan
73b7acea44 implement test harness 2018-03-17 15:25:25 -05:00
Niels Abspoel
85a51a45a3
Merge pull request #185 from netmanagers/master 
Allow to specify a different passenger config file in nginx.ng
 2018-02-26 11:32:18 +01:00
Javier Bértoli
c5c1047865 Allow to specify a different passenger config file in nginx.ng 2018-02-13 21:27:15 -03:00
Arthur Lutz
159f4da4d0
[README] include nginx.ng.certifcates 2018-01-26 15:37:34 +01:00
Arthur Lutz
78ddf90f5b
[users] use {{ htauth }} variable 2018-01-24 16:56:43 +01:00
Arthur Lutz
f3ef626ec4
[users.sls] touch /etc/nginx/.htpasswd 2018-01-24 16:44:51 +01:00
Andres Montalban
cb938864f1 Merge remote-tracking branch 'upstream/master' 2017-12-26 13:03:41 -03:00
Niels Abspoel
896fdee0dd
Merge pull request #176 from Perceptyx/fix_pr_172 
Fix for PR #172
 2017-12-22 16:47:28 +01:00
Andres Montalban
52015ae160 Merge branch 'fix_pr_172' 2017-12-22 12:05:46 -03:00
Andres Montalban
ac90a9f07b Fix for saltstack-formulas/nginx-formula/#172 2017-12-22 10:33:23 -03:00
Niels Abspoel
dc292fb780
Merge pull request #175 from 9numbernine9/fix-dhparam-default 
Add default value when calling pillar.get on nginx🆖dhparam
 2017-12-21 09:02:20 +01: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
1db6ddeb66
Merge pull request #82 from devaos/master 
Allow debug symbols to be included when compiling from source
 2017-12-16 09:27:26 +01:00
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