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

54 Commits

This Branch
This Branch
All Branches
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
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
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
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
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
David Czarnecki
14310ff263 Fix a filename and pillar key issue 
* Ensure `common.sls` references correct template filename
* Use `pillar.get(...)` for message_do_not_modify with default
 2013-09-25 16:53:32 -04:00
Seth House
ad5959ab63 Merge pull request #5 from agoragames/reorganize-formula-files 
Re-organize nginx formula files
 2013-09-25 13:10:47 -07:00
David Czarnecki
b470a1b496 Re-organize nginx formula files 
* Re-organize according to http://docs.saltstack.com/topics/conventions/formulas.html#writing-formulas
 2013-09-25 15:50:25 -04:00
Seth House
905c1eff2f Merge pull request #4 from auser/master 
Added the ability to build from source or package, with luajit2 and openresty
 2013-08-22 11:32:22 -07:00
Ari Lerner
cf3a60fcf7 Merged with master 2013-08-22 11:22:06 -07:00
Ari Lerner
d11dd3f887 Added pillar example 2013-08-21 12:17:34 -07:00
Ari Lerner
eb2bc62f5a Updated structure as well as added package and source 2013-08-21 12:01:51 -07:00
Ari Lerner
0d192b3928 Moving package to be on the top-level, instead of one level down 2013-08-21 12:01:37 -07:00
David Boucha
d258164995 Merge pull request #3 from mike-ainsworth/master 
Proper dictionary lookup
 2013-08-13 09:58:33 -07:00
root
1f7599072c Proper dictionary lookup 2013-08-13 09:54:58 -06:00
Joseph Hall
b721fb9645 Merge pull request #2 from stp-ip/new_structure 
Restructure according to new guidelines.
 2013-07-27 16:28:17 -07:00
Michael Grosser
7c16f55a58 Reflect template move in files. 2013-07-28 01:05:46 +02:00
Michael Grosser
6c6d89ca1e Move templates to reflect formula guide. 2013-07-28 01:04:55 +02:00
Michael Grosser
2390588eb7 Move README to rst 2013-07-28 01:04:40 +02:00
Michael Grosser
e9e68bd8db Add LICENSE. 2013-07-28 01:04:22 +02:00