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
5 år sedan
Imran Iqbal
8ded496de6
Merge pull request #218 from daks/context-fix
fix: corrected indentation on context in file.managed states
5 år sedan
Eric Veiras Galisson
cfed4ce2d1
fix: corrected indentation on context in file.managed states
5 år sedan
Imran Iqbal
c604d501d6
Merge pull request #216 from sticky-note/fix/FreeBSD-default-snippets_dir
added default snippets directory for FreeBSD platform
5 år sedan
sam
0ecdee9c35
added default snippets directory for FreeBSD platform
5 år sedan
Niels Abspoel
f2068947cb
Merge pull request #215 from noelmcloughlin/fixes
Updated for Suse 15.0
5 år sedan
N
cea121299e
Updated for Suse 15.0
5 år sedan
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
5 år sedan
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
9 år sedan
Niels Abspoel
854d1edcd4
Merge pull request #211 from noelmcloughlin/fix7
Fully document #193 stream module
6 år sedan
N
8921404935
Update based on review comments
6 år sedan
Niels Abspoel
6a63ec35ff
Merge pull request #212 from noelmcloughlin/fix8
Document pid_file pillar for nginx state (#96 )
6 år sedan
N
f2c4d80bf6
Document pid_file ( #96 )
6 år sedan
N
5dfeeb9d08
Fully document #193 stream module
6 år sedan
Niels Abspoel
a1220edb36
Merge pull request #209 from noelmcloughlin/fixes6
Fix sites-available bug in formula logic
6 år sedan
Niels Abspoel
b633ca489c
Merge pull request #210 from noelmcloughlin/master
Document issue 93 in pillar.example
6 år sedan
N
cc450e2d78
Document issue 93 in pillar.example
6 år sedan
N
2356b4a989
Fix bug related to #188
6 år sedan
Niels Abspoel
14572a1c3a
Merge pull request #128 from ghost/master
Fix build deps for NGINX NG build from source
6 år sedan
Niels Abspoel
bd9fb88eee
Merge pull request #205 from noelmcloughlin/master
makedirs needed for 'available_dir' pillar
6 år sedan
Niels Abspoel
2a97b07084
Merge pull request #206 from noelmcloughlin/fixes2
Fix #182 bug
6 år sedan
Niels Abspoel
60b8e74bc0
Merge pull request #207 from noelmcloughlin/fixes3
Enforce PPA's on Ubuntu(s) only; not Debian
6 år sedan
Niels Abspoel
d1a629bc8c
Merge pull request #208 from noelmcloughlin/fixes4
Document #122 solution in pillar.example
6 år sedan
N
f347c14c74
Document workaround for #122
6 år sedan
N
b6dc52444c
Enforce PPA's on Ubuntu(s) only; not Debian
6 år sedan
N
e5b96c169e
Fix #182
6 år sedan
N
1037120561
Merge pull request #150 from europeconsulting/unsorted_context_mappings
Disabled automatic sorting of mapping keys in jinja templating
6 år sedan
N
86f0ae93eb
makedirs is important for 'available_dir' pillar
6 år sedan
N
5ca0ef2446
Merge branch 'master' into unsorted_context_mappings
6 år sedan
N
698f7cc724
Merge pull request #177 from Perceptyx/fix_config_require
Servers config should require available/enabled dirs
6 år sedan
N
43f9b37c77
Merge pull request #203 from bmwiedemann/master
Add SUSE support and 2 small fixes
6 år sedan
Niels Abspoel
1efee48d67
Merge pull request #186 from meganlkm/test-harness
implement test harness
6 år sedan
Bernhard M. Wiedemann
42ad7c11d8
Fix detection of systemd
on openSUSE Leap 15.0, the string was systemd.cpython-36
6 år sedan
Bernhard M. Wiedemann
6f5ac946d1
Add support for SUSE OSes
like openSUSE and SLES
6 år sedan
Bernhard M. Wiedemann
8c780fa63f
Use home and conf_dir from map.jinja
to reduce duplication of constants
6 år sedan
Niels Abspoel
355a968a2b
Merge pull request #197 from MEschenbacher/pillarcert
deploy certificates directly from pillar
6 år sedan
Niels Abspoel
8c1ab18ea6
Merge pull request #199 from ghtyrant/snippets
Snippets
6 år sedan
Fabian Schlager
cfd7e670f4
Add example
6 år sedan
Fabian Schlager
3125f9dbcc
Add support for snippets
7 år sedan
Niels Abspoel
4323f638f2
Merge pull request #198 from aanriot/master
Allow installation of multiple packages
6 år sedan
Alexandre Anriot
b2c07443ca
Allow installation of multiple packages
6 år sedan
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.
6 år sedan
Javier Bértoli
3a5b51940e
Merge pull request #196 from bebosudo/fix_tab_pillar_example
Replace tabs in pillar.example with spaces.
6 år sedan
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
^
```
6 år sedan
Niels Abspoel
a5624627dc
Merge pull request #192 from morsik/patch-1
Allow to use load_module directly
6 år sedan
Konrad Mosoń
c75ad64348
Example for load_module: comment how it works
6 år sedan
Konrad Mosoń
9c4634d40a
Example for load_module
6 år sedan
Megan
1ba5001b34
Merge branch 'master' into test-harness
6 år sedan
Konrad Mosoń
f16d800c83
Allow to use load_module without including external files
6 år sedan
Andres Montalban
7a71b09da5
Merge remote-tracking branch 'upstream/master' into fix_config_require
6 år sedan