Commit Graph

6 Commits

Author SHA1 Message Date
Forrest Alvarez
e511042ac7 Update the map file for ng to use nginx as the redhat user instead of httpd. 2014-11-07 15:29:50 -08:00
Wes Turner
b2122db4f6 BUG: Fix pkgrepo.managed, from_source -> install_from_source (consistency) 2014-08-11 22:07:32 -05:00
Erik Johnson
01cb1f9576 Revert "Remove merge argument from pillar.get"
This reverts commit f6ba9ddb59.

the nginx.ng formula is only compatible with the upcoming feature
release, as noted here:

https://github.com/saltstack-formulas/nginx-formula#nginxng
2014-07-03 15:40:15 -05:00
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
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