Joseph Hall
|
c8413788b0
|
Merge pull request #23 from the-control-group/master
set 'daemon on;' by default
|
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 |
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
|
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 |
Juan Manuel
|
1b935c1190
|
Fixed minor typo in nginx.ng.config.sls
|
10 years ago |
Seth House
|
418a8b942b
|
Merge pull request #20 from spsoit/master
Context parameter safety fixes
|
10 years ago |
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
|
10 years ago |
Seth House
|
8026013ae1
|
Merge pull request #19 from spsoit/master
Tightened up some ng requisites.
|
10 years ago |
Chad Heuschober
|
9f8dc59973
|
Tightened up some requirements.
|
10 years ago |
Seth House
|
3b89181478
|
Added missing TOC for the ng states
|
10 years ago |
Seth House
|
3494514e46
|
Changed README to emphasize the differences with the "ng" states
|
10 years ago |
Seth House
|
56a333295f
|
Merge pull request #18 from spsoit/master
Adds NG states
|
10 years ago |
Chad Heuschober
|
ffafd1e0d7
|
More documentation touches.
|
10 years ago |
Chad Heuschober
|
7f27555a4b
|
Completes documentation for this first-pass.
|
10 years ago |
Chad Heuschober
|
825bd7950e
|
Finishes vhost config template
|
10 years ago |
Chad Heuschober
|
81de880fe0
|
Adds basic ng state functionality.
|
10 years ago |
Seth House
|
6831d739c1
|
Merge pull request #15 from tfolio/upstart-optional
Add pillar item to disable using upstart-based services
|
10 years ago |
Mark Lee
|
59c2f8b21f
|
Add pillar item to disable using upstart-based services
Fixes GH saltstack-formulas/nginx-formula#14.
|
10 years ago |
Joseph Hall
|
3c1b9f5c09
|
Merge pull request #13 from gravyboat/master
Updates to the readme.
|
11 years ago |
Forrest Alvarez
|
2cb1950d38
|
Updates to the readme.
|
11 years ago |
Seth House
|
51c67be33b
|
Merge pull request #12 from ekristen/master
fixing bug with common.sls that causes it to fail
|
11 years ago |
Erik
|
a2c9d686ed
|
fixing bug with common.sls that causes it to fail
|
11 years ago |
Seth House
|
3e0052be75
|
Merge pull request #10 from metamx/master
move templates to the right place
|
11 years ago |
Jeff Strunk
|
068de6fada
|
move templates to the right place
|
11 years ago |
Erik Johnson
|
6e3d08c704
|
Merge pull request #9 from metamx/master
remove extraneous nrpe include (fixes #8)
|
11 years ago |
Jeff Strunk
|
4542bd5142
|
remove extraneous nrpe include
|
11 years ago |
Joseph Hall
|
0b96e27ab3
|
Merge pull request #7 from agoragames/fix-iteration-add-changelog-and-version
Fix source module iteration
|
11 years ago |
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
|
11 years ago |
Seth House
|
17d1fef1c7
|
Merge pull request #6 from agoragames/fix-filename-and-pillar-issue
Fix a filename and pillar key issue
|
11 years ago |
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
|
11 years ago |
Seth House
|
ad5959ab63
|
Merge pull request #5 from agoragames/reorganize-formula-files
Re-organize nginx formula files
|
11 years ago |
David Czarnecki
|
b470a1b496
|
Re-organize nginx formula files
* Re-organize according to http://docs.saltstack.com/topics/conventions/formulas.html#writing-formulas
|
11 years ago |
Seth House
|
905c1eff2f
|
Merge pull request #4 from auser/master
Added the ability to build from source or package, with luajit2 and openresty
|
11 years ago |
Ari Lerner
|
cf3a60fcf7
|
Merged with master
|
11 years ago |
Ari Lerner
|
d11dd3f887
|
Added pillar example
|
11 years ago |
Ari Lerner
|
eb2bc62f5a
|
Updated structure as well as added package and source
|
11 years ago |
Ari Lerner
|
0d192b3928
|
Moving package to be on the top-level, instead of one level down
|
11 years ago |
David Boucha
|
d258164995
|
Merge pull request #3 from mike-ainsworth/master
Proper dictionary lookup
|
11 years ago |
root
|
1f7599072c
|
Proper dictionary lookup
|
11 years ago |
Joseph Hall
|
b721fb9645
|
Merge pull request #2 from stp-ip/new_structure
Restructure according to new guidelines.
|
11 years ago |
Michael Grosser
|
7c16f55a58
|
Reflect template move in files.
|
11 years ago |
Michael Grosser
|
6c6d89ca1e
|
Move templates to reflect formula guide.
|
11 years ago |
Michael Grosser
|
2390588eb7
|
Move README to rst
|
11 years ago |
Michael Grosser
|
e9e68bd8db
|
Add LICENSE.
|
11 years ago |