Travis J Parker
|
02faa5c88a
|
ignore vim droppings please
|
10 years ago |
Travis J Parker
|
0da43d9861
|
move upstart-related states to their own file
|
10 years ago |
Forrest
|
90c539de8c
|
Merge pull request #44 from westurner/add_install_from_ppa
BUG: pkgrepo.absent, pkgrepo:watch_in(pkg), install_from_ppa
|
10 years ago |
Wes Turner
|
1f5d6bb7ee
|
BUG: Conditional pkgrepo.absent instead of enabled, pkgrepo:watch_in
|
10 years ago |
Wes Turner
|
b2122db4f6
|
BUG: Fix pkgrepo.managed, from_source -> install_from_source (consistency)
|
10 years ago |
Nitin Madhok
|
c3c5d9777d
|
Merge pull request #43 from saltstack-formulas/revert-42-add_install_from_ppa
Revert "ENH: Add install_from_ppa pillar setting and PPA pkgrepo"
|
10 years ago |
Nitin Madhok
|
1c0e8d60ae
|
Revert "ENH: Add install_from_ppa pillar setting and PPA pkgrepo"
|
10 years ago |
Nitin Madhok
|
c449e5fb4f
|
Merge pull request #42 from westurner/add_install_from_ppa
ENH: Add install_from_ppa pillar setting and PPA pkgrepo
|
10 years ago |
Wes Turner
|
c696e87f34
|
ENH: Add install_from_ppa pillar setting and PPA pkgrepo
|
10 years ago |
Seth House
|
0810b94c55
|
Merge pull request #41 from percipient/sync-nginx-upstart
Synchronized upstart script with the one recommended by nginx.
|
10 years ago |
oboyle
|
07b7088b98
|
Synchronized upstart script with the one recommended by nginx.
http://wiki.nginx.org/Upstart
|
10 years ago |
Erik Johnson
|
eaf88dd5de
|
Quote "on" to keep it from being loaded as bool
Fixes #39.
|
10 years ago |
Erik Johnson
|
01cb1f9576
|
Revert "Remove merge argument from pillar.get"
This reverts commit f6ba9ddb59 .
the nginx.ng formula is only compatible with the upcoming feature
release, as noted here:
https://github.com/saltstack-formulas/nginx-formula#nginxng
|
10 years ago |
Erik Johnson
|
f6ba9ddb59
|
Remove merge argument from pillar.get
This argument is only currently available in develop, and thus does not
belong in this formula at this time.
|
10 years ago |
Seth House
|
7febd2deb6
|
Merge pull request #30 from the-control-group/feature/set-real-ip
Support http_realip module
|
10 years ago |
Seth House
|
dc6757d2c9
|
Merge pull request #27 from ahmadsherif/patch-1
Create /var/log/nginx before running mkfifo
|
10 years ago |
Seth House
|
e58a903584
|
Merge pull request #34 from fayetted/service_tab_completion
Add tab completion for upstart
|
10 years ago |
Seth House
|
65b1594914
|
Merge pull request #31 from tfolio/users-optional
Optionally include nginx.users via a pillar value
|
10 years ago |
Joseph Hall
|
ee22c1c8c8
|
Merge pull request #35 from spsoit/master
Fixes missing requisites in ng.init
|
10 years ago |
Chad Heuschober
|
90a83d39a2
|
Fixes typo in last commit.
|
10 years ago |
Chad Heuschober
|
6069abd50d
|
Fixes missing requisite in ng.init
|
10 years ago |
Dan Fayette
|
d7dcf75ed5
|
Add tab completion for upstart
If upstart is used, add symlink: /etc/init.d/nginx -> /lib/init/upstart-job
|
10 years ago |
Joseph Hall
|
3a63a8c2bd
|
Merge pull request #32 from jaanush/master
Added map file to resolve apache utils package name
|
10 years ago |
root
|
a03ece8de4
|
Added map file to resolve apache utils package name
|
10 years ago |
Mark Lee
|
920ba9b1a4
|
Optionally include nginx.users via a pillar value
|
10 years ago |
Kent Shultz
|
a978ac74fc
|
change attribute name for better readability
|
10 years ago |
Kent Shultz
|
c2b896ea52
|
remove nginx -V check; add pillar example
|
10 years ago |
Joseph Hall
|
a0a272d819
|
Merge pull request #24 from the-control-group/feature/misc-config-items
Feature/misc config items
|
10 years ago |
Joseph Hall
|
c8413788b0
|
Merge pull request #23 from the-control-group/master
set 'daemon on;' by default
|
10 years ago |
Kent Shultz
|
26f606e634
|
fix name of cmd call
|
10 years ago |
Kent Shultz
|
def291d210
|
check for realip module
|
10 years ago |
Kent Shultz
|
4f0aa05b6f
|
whitespace cleanup
|
10 years ago |
Kent Shultz
|
3616bcc9cf
|
add support for realip
|
10 years ago |
Kent Shultz
|
ed0879a42c
|
Merge branch 'master' of https://github.com/saltstack-formulas/nginx-formula
|
10 years ago |
Forrest
|
bd5b3b8ce8
|
Merge pull request #29 from ahmadsherif/patch-3
Fix errors in source.sls
|
10 years ago |
Ahmad Sherif
|
aac18d2505
|
Correct requisite ID in source.sls
|
10 years ago |
Ahmad Sherif
|
c28cac3483
|
Group source.sls include declarations into one
|
10 years ago |
Ahmad Sherif
|
36b00e6332
|
Remove useless if statement in source.sls
|
10 years ago |
Ahmad Sherif
|
6a9efa774d
|
Create /var/log/nginx before running mkfifo
|
10 years ago |
Joseph Hall
|
5164152de7
|
Merge pull request #26 from fly/fix-doclink
fix link to formula usage instructions
|
10 years ago |
Jon Chen
|
5e7b78809e
|
fix link to formula usage instructions
|
10 years ago |
Kent Shultz
|
84d00fd56c
|
more messing with suppress newline in jinja
|
10 years ago |
Kent Shultz
|
8f894ea6e6
|
suppress newlines
|
10 years ago |
Kent Shultz
|
c90a12d9f5
|
support error_log location and log level; fix gzip_disable syntax error
|
10 years ago |
Kent Shultz
|
16ecfa1298
|
add support for gzip_disable
|
10 years ago |
Kent Shultz
|
6fd6ee7b20
|
add support for setting default_type
|
10 years ago |
Kent Shultz
|
7f6b7841c3
|
set 'daemon on;' by default
|
10 years ago |
Kent Shultz
|
af46708a56
|
set 'daemon on;' by default
|
10 years ago |
Joseph Hall
|
a29d7b1f0c
|
Merge pull request #21 from TaiSHiNet/master
Fixed minor typo in nginx.ng.config.sls
|
10 years ago |
Kent Shultz
|
b2a7b3fe1b
|
remove extra curly
|
10 years ago |