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.
|
2014-07-03 12:53:13 -05:00 |
|
Seth House
|
7febd2deb6
|
Merge pull request #30 from the-control-group/feature/set-real-ip
Support http_realip module
|
2014-06-24 14:13:56 -06:00 |
|
Seth House
|
dc6757d2c9
|
Merge pull request #27 from ahmadsherif/patch-1
Create /var/log/nginx before running mkfifo
|
2014-06-24 13:44:38 -06:00 |
|
Seth House
|
e58a903584
|
Merge pull request #34 from fayetted/service_tab_completion
Add tab completion for upstart
|
2014-06-24 13:40:43 -06:00 |
|
Seth House
|
65b1594914
|
Merge pull request #31 from tfolio/users-optional
Optionally include nginx.users via a pillar value
|
2014-06-24 13:30:38 -06:00 |
|
Joseph Hall
|
ee22c1c8c8
|
Merge pull request #35 from spsoit/master
Fixes missing requisites in ng.init
|
2014-06-19 14:26:09 -06:00 |
|
Chad Heuschober
|
90a83d39a2
|
Fixes typo in last commit.
|
2014-06-19 11:25:40 -04:00 |
|
Chad Heuschober
|
6069abd50d
|
Fixes missing requisite in ng.init
|
2014-06-19 11:21:39 -04:00 |
|
Dan Fayette
|
d7dcf75ed5
|
Add tab completion for upstart
If upstart is used, add symlink: /etc/init.d/nginx -> /lib/init/upstart-job
|
2014-06-19 10:43:00 -04:00 |
|
Joseph Hall
|
3a63a8c2bd
|
Merge pull request #32 from jaanush/master
Added map file to resolve apache utils package name
|
2014-06-18 07:50:51 -06:00 |
|
root
|
a03ece8de4
|
Added map file to resolve apache utils package name
|
2014-06-18 11:57:05 +02:00 |
|
Mark Lee
|
920ba9b1a4
|
Optionally include nginx.users via a pillar value
|
2014-06-15 22:01:14 -07:00 |
|
Kent Shultz
|
a978ac74fc
|
change attribute name for better readability
|
2014-06-02 16:03:04 -07:00 |
|
Kent Shultz
|
c2b896ea52
|
remove nginx -V check; add pillar example
|
2014-06-02 16:00:09 -07:00 |
|
Joseph Hall
|
a0a272d819
|
Merge pull request #24 from the-control-group/feature/misc-config-items
Feature/misc config items
|
2014-05-31 01:10:09 -06:00 |
|
Joseph Hall
|
c8413788b0
|
Merge pull request #23 from the-control-group/master
set 'daemon on;' by default
|
2014-05-31 01:09:29 -06:00 |
|
Kent Shultz
|
26f606e634
|
fix name of cmd call
|
2014-05-30 11:05:31 -07:00 |
|
Kent Shultz
|
def291d210
|
check for realip module
|
2014-05-30 11:02:46 -07:00 |
|
Kent Shultz
|
4f0aa05b6f
|
whitespace cleanup
|
2014-05-30 10:30:08 -07:00 |
|
Kent Shultz
|
3616bcc9cf
|
add support for realip
|
2014-05-30 10:28:54 -07:00 |
|
Kent Shultz
|
ed0879a42c
|
Merge branch 'master' of https://github.com/saltstack-formulas/nginx-formula
|
2014-05-30 10:17:53 -07:00 |
|
Forrest
|
bd5b3b8ce8
|
Merge pull request #29 from ahmadsherif/patch-3
Fix errors in source.sls
|
2014-05-30 09:41:19 -07:00 |
|
Ahmad Sherif
|
aac18d2505
|
Correct requisite ID in source.sls
|
2014-05-30 19:31:00 +03:00 |
|
Ahmad Sherif
|
c28cac3483
|
Group source.sls include declarations into one
|
2014-05-30 19:28:59 +03:00 |
|
Ahmad Sherif
|
36b00e6332
|
Remove useless if statement in source.sls
|
2014-05-30 19:24:47 +03:00 |
|
Ahmad Sherif
|
6a9efa774d
|
Create /var/log/nginx before running mkfifo
|
2014-05-30 18:55:26 +03:00 |
|
Joseph Hall
|
5164152de7
|
Merge pull request #26 from fly/fix-doclink
fix link to formula usage instructions
|
2014-05-30 00:11:46 -06:00 |
|
Jon Chen
|
5e7b78809e
|
fix link to formula usage instructions
|
2014-05-30 00:52:19 -04:00 |
|
Kent Shultz
|
84d00fd56c
|
more messing with suppress newline in jinja
|
2014-05-29 14:15:24 -07:00 |
|
Kent Shultz
|
8f894ea6e6
|
suppress newlines
|
2014-05-29 14:13:25 -07:00 |
|
Kent Shultz
|
c90a12d9f5
|
support error_log location and log level; fix gzip_disable syntax error
|
2014-05-29 14:05:14 -07:00 |
|
Kent Shultz
|
16ecfa1298
|
add support for gzip_disable
|
2014-05-29 13:44:31 -07:00 |
|
Kent Shultz
|
6fd6ee7b20
|
add support for setting default_type
|
2014-05-29 12:42:10 -07:00 |
|
Kent Shultz
|
7f6b7841c3
|
set 'daemon on;' by default
|
2014-05-29 11:30:29 -07:00 |
|
Kent Shultz
|
af46708a56
|
set 'daemon on;' by default
|
2014-05-29 09:58:02 -07:00 |
|
Joseph Hall
|
a29d7b1f0c
|
Merge pull request #21 from TaiSHiNet/master
Fixed minor typo in nginx.ng.config.sls
|
2014-05-29 00:40:54 -06:00 |
|
Kent Shultz
|
b2a7b3fe1b
|
remove extra curly
|
2014-05-28 17:06:45 -07:00 |
|
Kent Shultz
|
8d4f4b6d6f
|
suppress newlines
|
2014-05-28 17:03:55 -07:00 |
|
Kent Shultz
|
b4ae528df5
|
add support for events { use <epoll,etc>}
|
2014-05-28 16:57:48 -07:00 |
|
Kent Shultz
|
928882e401
|
add support for worker_rlimit_nofile
|
2014-05-28 16:33:29 -07:00 |
|
Juan Manuel
|
1b935c1190
|
Fixed minor typo in nginx.ng.config.sls
|
2014-05-27 20:55:49 -03:00 |
|
Seth House
|
418a8b942b
|
Merge pull request #20 from spsoit/master
Context parameter safety fixes
|
2014-05-21 17:35:00 -06:00 |
|
Chad Heuschober
|
88c39caa52
|
Adjusts the parameters passed to context to be passed as json and hopefully avoid double quoting. Also brings indentation in-line with salt doc 23.14.1.2.1
|
2014-05-21 15:13:13 -04:00 |
|
Seth House
|
8026013ae1
|
Merge pull request #19 from spsoit/master
Tightened up some ng requisites.
|
2014-05-20 23:49:14 -06:00 |
|
Chad Heuschober
|
9f8dc59973
|
Tightened up some requirements.
|
2014-05-21 01:01:43 -04:00 |
|
Seth House
|
3b89181478
|
Added missing TOC for the ng states
|
2014-05-19 11:53:31 -06:00 |
|
Seth House
|
3494514e46
|
Changed README to emphasize the differences with the "ng" states
|
2014-05-19 11:50:15 -06:00 |
|
Seth House
|
56a333295f
|
Merge pull request #18 from spsoit/master
Adds NG states
|
2014-05-19 11:42:22 -06:00 |
|
Chad Heuschober
|
ffafd1e0d7
|
More documentation touches.
|
2014-05-19 13:22:51 -04:00 |
|
Chad Heuschober
|
7f27555a4b
|
Completes documentation for this first-pass.
|
2014-05-19 13:17:23 -04:00 |
|