Commit Graph

269 Commits

Author SHA1 Message Date
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
Chad Heuschober
825bd7950e Finishes vhost config template 2014-05-19 13:04:43 -04:00
Chad Heuschober
81de880fe0 Adds basic ng state functionality. 2014-05-15 18:06:48 -04:00
Seth House
6831d739c1 Merge pull request #15 from tfolio/upstart-optional
Add pillar item to disable using upstart-based services
2014-05-08 08:59:09 -06:00
Mark Lee
59c2f8b21f Add pillar item to disable using upstart-based services
Fixes GH saltstack-formulas/nginx-formula#14.
2014-05-04 11:15:04 -07:00
Joseph Hall
3c1b9f5c09 Merge pull request #13 from gravyboat/master
Updates to the readme.
2014-02-08 05:37:29 -07:00
Forrest Alvarez
2cb1950d38 Updates to the readme. 2014-02-08 06:03:40 +00:00
Seth House
51c67be33b Merge pull request #12 from ekristen/master
fixing bug with common.sls that causes it to fail
2014-01-13 12:33:07 -08:00
Erik
a2c9d686ed fixing bug with common.sls that causes it to fail 2014-01-13 13:12:37 -05:00
Seth House
3e0052be75 Merge pull request #10 from metamx/master
move templates to the right place
2013-10-18 19:36:53 -07:00
Jeff Strunk
068de6fada move templates to the right place 2013-10-18 21:41:05 -03:00
Erik Johnson
6e3d08c704 Merge pull request #9 from metamx/master
remove extraneous nrpe include (fixes #8)
2013-10-18 16:47:45 -07:00
Jeff Strunk
4542bd5142 remove extraneous nrpe include 2013-10-18 20:44:58 -03:00
Joseph Hall
0b96e27ab3 Merge pull request #7 from agoragames/fix-iteration-add-changelog-and-version
Fix source module iteration
2013-09-27 12:06:34 -07:00
David Czarnecki
6a1becff4a Fix source module iteration
* Fixing iteration for building nginx by source with respect
  to modules
* Adding `CHANGELOG.rst` and `VERSION` per https://groups.google.com/forum/#!topic/salt-users/zHguqsk-mds
2013-09-27 14:59:01 -04:00
Seth House
17d1fef1c7 Merge pull request #6 from agoragames/fix-filename-and-pillar-issue
Fix a filename and pillar key issue
2013-09-25 14:05:45 -07:00