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

350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Veiras Galisson
b2bcb4c998 test(inspec): switch tests to use Inspec 2019-04-12 22:29:20 +01:00
Garrett W
62e8ac0b33 Pillar fixes (#217) 
Squashed from:

* pillar.example: an include was missing a colon
* pillar.example: 2 directives not indented properly
* pillar.example: added the stock log_format
* pillar.example: make log path match map.jinja
* pillar.example: worker_connections value from latest mainline nginx
* pillar.example: fixed other uses of include
* pillar.example: corrected formatting
* pillar.example: corrected log_format
* pillar.example: reset log_format to try another day
 2019-04-11 17:45:48 +01:00
Imran Iqbal
8ded496de6
Merge pull request #218 from daks/context-fix 
fix: corrected indentation on context in file.managed states
 2019-04-11 17:14:29 +01:00
Eric Veiras Galisson
cfed4ce2d1 fix: corrected indentation on context in file.managed states 2019-04-11 15:02:18 +02:00
Imran Iqbal
c604d501d6
Merge pull request #216 from sticky-note/fix/FreeBSD-default-snippets_dir 
added default snippets directory for FreeBSD platform
 2019-03-06 01:23:54 +00:00
sam
0ecdee9c35 added default snippets directory for FreeBSD platform 2019-03-06 11:43:03 +11:00
Niels Abspoel
f2068947cb
Merge pull request #215 from noelmcloughlin/fixes 
Updated for Suse 15.0
 2019-02-22 10:17:52 +01:00
N
cea121299e
Updated for Suse 15.0 2019-02-21 18:16:03 +00:00
Niels Abspoel
5006a2a8aa
Merge pull request #154 from M2Mobi/server_config_lists 
Fix multiple values for the same key (include/listen) in server config file
 2019-02-19 23:06:31 +01:00
Heinz Wiesinger
1541a59c83 Fix multiple values for the same key (include/listen) in server config file. 
With this one can now also write

 - include:
   - file1
   - file2

Rather than only

 - include: file1
 - include: file2
 2019-02-19 09:26:15 +01:00
Niels Abspoel
854d1edcd4
Merge pull request #211 from noelmcloughlin/fix7 
Fully document #193 stream module
 2019-01-26 20:11:29 +01:00
N
8921404935
Update based on review comments 2019-01-26 16:07:58 +00:00
Niels Abspoel
6a63ec35ff
Merge pull request #212 from noelmcloughlin/fix8 
Document pid_file pillar for nginx state (#96)
 2019-01-26 13:54:17 +01:00
N
f2c4d80bf6
Document pid_file (#96) 2019-01-26 11:59:24 +00:00
N
5dfeeb9d08
Fully document #193 stream module 2019-01-25 22:50:00 +00:00
Niels Abspoel
a1220edb36
Merge pull request #209 from noelmcloughlin/fixes6 
Fix sites-available bug in formula logic
 2019-01-25 21:50:40 +01:00
Niels Abspoel
b633ca489c
Merge pull request #210 from noelmcloughlin/master 
Document issue 93 in pillar.example
 2019-01-25 21:49:10 +01:00
N
cc450e2d78
Document issue 93 in pillar.example 2019-01-25 19:49:19 +00:00
N
2356b4a989
Fix bug related to #188 2019-01-25 19:20:58 +00:00
Niels Abspoel
14572a1c3a
Merge pull request #128 from ghost/master 
Fix build deps for NGINX NG build from source
 2019-01-25 20:04:07 +01:00
Niels Abspoel
bd9fb88eee
Merge pull request #205 from noelmcloughlin/master 
makedirs needed for 'available_dir' pillar
 2019-01-25 19:51:56 +01:00
Niels Abspoel
2a97b07084
Merge pull request #206 from noelmcloughlin/fixes2 
Fix #182 bug
 2019-01-25 19:50:54 +01:00
Niels Abspoel
60b8e74bc0
Merge pull request #207 from noelmcloughlin/fixes3 
Enforce PPA's on Ubuntu(s) only; not Debian
 2019-01-25 19:50:23 +01:00
Niels Abspoel
d1a629bc8c
Merge pull request #208 from noelmcloughlin/fixes4 
Document #122 solution in pillar.example
 2019-01-25 19:49:38 +01:00
N
f347c14c74
Document workaround for #122 2019-01-25 15:43:12 +00:00
N
b6dc52444c
Enforce PPA's on Ubuntu(s) only; not Debian 2019-01-25 15:09:13 +00:00
N
e5b96c169e
Fix #182 2019-01-25 13:25:11 +00:00
N
1037120561
Merge pull request #150 from europeconsulting/unsorted_context_mappings 
Disabled automatic sorting of mapping keys in jinja templating
 2019-01-24 20:25:37 +00:00
N
86f0ae93eb
makedirs is important for 'available_dir' pillar 2019-01-23 22:56:22 +00:00
N
5ca0ef2446
Merge branch 'master' into unsorted_context_mappings 2019-01-23 20:16:00 +00:00
N
698f7cc724
Merge pull request #177 from Perceptyx/fix_config_require 
Servers config should require available/enabled dirs
 2019-01-23 20:09:15 +00:00
N
43f9b37c77
Merge pull request #203 from bmwiedemann/master 
Add SUSE support and 2 small fixes
 2019-01-23 20:03:31 +00:00
Niels Abspoel
1efee48d67
Merge pull request #186 from meganlkm/test-harness 
implement test harness
 2018-12-20 20:17:09 +01:00
Bernhard M. Wiedemann
42ad7c11d8 Fix detection of systemd 
on openSUSE Leap 15.0, the string was systemd.cpython-36
 2018-12-20 13:19:28 +01:00
Bernhard M. Wiedemann
6f5ac946d1 Add support for SUSE OSes 
like openSUSE and SLES
 2018-12-20 12:37:46 +01:00
Bernhard M. Wiedemann
8c780fa63f Use home and conf_dir from map.jinja 
to reduce duplication of constants
 2018-12-20 12:37:03 +01:00
Niels Abspoel
355a968a2b
Merge pull request #197 from MEschenbacher/pillarcert 
deploy certificates directly from pillar
 2018-10-20 20:19:56 +02:00
Niels Abspoel
8c1ab18ea6
Merge pull request #199 from ghtyrant/snippets 
Snippets
 2018-10-20 19:53:44 +02:00
Fabian Schlager
cfd7e670f4 Add example 2018-10-20 16:36:16 +02:00
Fabian Schlager
3125f9dbcc Add support for snippets 2018-10-20 16:29:13 +02:00
Niels Abspoel
4323f638f2
Merge pull request #198 from aanriot/master 
Allow installation of multiple packages
 2018-10-19 21:18:28 +02:00
Alexandre Anriot
b2c07443ca Allow installation of multiple packages 2018-10-19 16:15:01 +02:00
Maximilian Eschenbacher
cb030b04ac deploy certificates directly from pillar 
... by providing a pillar string. I developed this for use in
combination with ext_pillar and file_tree to deploy letsencrypt
certificates.
 2018-10-04 16:26:37 +02:00
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