Commit Graph

574 Commits

Author SHA1 Message Date
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
Michael Grosser
06cbe75d8a Add pillar.example 2013-07-28 01:04:12 +02:00
David Boucha
c81580635e Merge pull request #1 from auser/master
Added basic nginx layout with custom interfaces and logger
2013-06-18 00:29:12 -07:00
Ari Lerner
efe26afba0 Added basic nginx template and config file 2013-06-18 00:26:23 -07:00
Thomas S Hatch
6909274996 Initial commit 2013-06-12 15:08:54 -07:00