Commit Graph

569 Commits

Author SHA1 Message Date
Adam Herzog
be1aa5629e Use confext parameter when naming vhost config files. 2014-02-09 09:12:31 -05:00
Adam Herzog
1888584b94 Add config file extension (confext) to parameter map. 2014-02-09 09:11:55 -05:00
Forrest
b7edd43705 Merge pull request #19 from cedwards/master
added initial FreeBSD support
2014-01-29 19:33:37 -08:00
Christer Edwards
36051f4353 removed unneeded wsgi_path 2014-01-29 19:14:50 -07:00
Christer Edwards
001f2a9d9c added initial FreeBSD support 2014-01-29 19:12:47 -07:00
Seth House
641b70039a Change optional deps list to be a bulleted list to match 2014-01-24 13:34:16 -07:00
Seth House
aca9d6eeb3 Merge pull request #18 from gravyboat/master
Removed apt from items where it is not required, also modified fcgid to include apache as it requires the apache package.
2014-01-20 12:49:32 -08:00
Forrest Alvarez
3535ecae9a Removed apt from items where it is not required, also modified fcgid to include apache as it requires the apache package. 2014-01-20 20:47:04 +00:00
Seth House
ad541eb5bf Merge pull request #15 from bechtoldt/add_proxy_module_support
Adding mod_proxy and mod_proxy_http states
2014-01-08 07:30:39 -08:00
Seth House
b1e2d39849 Merge pull request #16 from bechtoldt/improvements
setting the remaining changes caused by the change to module.wait
2014-01-08 07:29:15 -08:00
Arnold Bechtoldt
d60aca39cb setting the correct parameter values for watch_in 2014-01-04 23:54:45 +01:00
Arnold Bechtoldt
1fce705bc0 setting the remaining changes caused by the change of cmd.wait to .module.wait in init.sls 2014-01-04 23:46:47 +01:00
Arnold Bechtoldt
b45a5f4fc4 adding mod_proxy and mod_proxy_http states, updating the README doc 2014-01-04 19:29:22 +01:00
Joseph Hall
b118690c53 Merge pull request #14 from galet/master
States for apache-reload and apache-restart using module.wait not working
2014-01-04 04:58:07 -08:00
Michal Galet
a3299dc1eb States for apache-reload and apache-restart using module.wait not working 2014-01-04 11:59:39 +00:00
Seth House
88d16e419a Merge pull request #12 from Jorge-Rodriguez/master
CustomLog directive takes two parameters. Introduced LogFormat variable ...
2013-11-29 18:12:40 -08:00
Jorge Rodriguez
845b58d15f CustomLog directive takes two parameters. Introduced LogFormat variable and defaulted to "common" format. 2013-11-29 10:19:16 +02:00
Seth House
9b5a6eb799 Merge pull request #11 from favadi/master
Fix wrong state path in README.rst
2013-11-18 20:16:01 -08:00
Diep Pham Van
5d746a2c15 Fix wrong state path
apache.vhost.standard --> apache.vhosts.standard
2013-11-19 11:04:30 +07:00
Seth House
950ce07185 Change cmd.wait to module.wait for platform independence 2013-11-05 14:54:56 -08:00
Joseph Hall
4c7b7233da Merge pull request #10 from PCMi/master
Bug fixes and upgrades
2013-11-05 14:31:08 -08:00
Alan McNea
92b167ffa8 Added vhost_alias.sls for that apache mod 2013-11-05 20:06:10 +00:00
Alan McNea
f153c78ba8 Added apache include and requires to php5.sls and rewrite.sls 2013-11-05 20:05:28 +00:00
Alan McNea
c863598ec7 Moved apache-reload and apache-restart commands to init.sls and invoke apache-reload from standard.sls 2013-11-05 19:34:06 +00:00
Alan McNea
e34c476ea1 Added DirectoryIndex, UseCanonicalName, and VirtualDocumentRoot properties to standard.tmpl 2013-11-05 19:32:49 +00:00
Alan McNea
b51e442440 Fixed bugs in standard.tmpl 2013-11-05 19:32:03 +00:00
Seth House
f1cff2dd22 Renamed package-map.jinja to map.jinja; is used for more than package names 2013-09-03 13:28:00 -06:00
Seth House
65e2bffaea Refactored the README with individual sections for each state 2013-08-29 14:15:06 -06:00
Seth House
2499a50135 Added apache.vhost formula 2013-08-29 02:10:23 -06:00
Seth House
a58bfa6d0f Added a few common directories to package-map.jinja 2013-08-29 02:10:22 -06:00
Seth House
d0c958dd87 mod_wsgi requires apache 2013-08-26 20:54:38 -06:00
Seth House
3f8a1edb97 Added mod_wsgi to package-map 2013-08-26 20:54:37 -06:00
Seth House
66683570e9 Added package-map.jinja 2013-08-26 20:42:11 -06:00
Seth House
5550f85bd9 Added a mod_wsgi state 2013-08-13 16:52:36 -06:00
Seth House
ee72d30b06 Merge branch 'generic-apache' 2013-08-13 15:13:53 -06:00
Seth House
d29f634367 Updated README with these changes moved Pillar examples into pillar file 2013-08-13 15:12:57 -06:00
Seth House
effba317fd Updated Debian-family formula to work on all Debian-family OSes 2013-08-13 15:03:42 -06:00
Seth House
746bbb9db3 Updated Debian-family formula to use main sls but keep custom ordering 2013-08-13 15:03:42 -06:00
Seth House
053c3443d7 Added basic formula to install Apache 2013-08-13 15:03:42 -06:00
Seth House
0e86fb8c9d Renamed the main sls file to debian_full
This is a great and full-featured way to configure Apache on
Debian-family OS's but we need a simpler and more universal formula as
the main entry-point.
2013-08-13 14:25:16 -06:00
Joseph Hall
ccb8fb6306 Move sls files into correct directory structure, fixes #7 2013-07-30 10:42:02 -06:00
Joseph Hall
0a37af72e2 Merge pull request #6 from PCMi/master
more advanced apache formula -- attempt #2
2013-07-29 15:05:27 -07:00
Alan McNea
64ff393954 Moved README.md to README.rst 2013-07-29 21:34:54 +00:00
Alan McNea
66c94a5ad3 Fixed up readme a little 2013-07-29 21:33:06 +00:00
Alan McNea
2d7406b5fc Changed spaces to tabs 2013-07-29 21:32:49 +00:00
Alan McNea
d8c2bc9c7d Updated readme 2013-07-29 21:32:34 +00:00
Alan McNea
182d4f9d9c Added some missing order statements 2013-07-29 21:32:16 +00:00
Alan McNea
edf0cba2a4 Bug fix 2013-07-29 21:32:01 +00:00
Alan McNea
545dccfa25 Added name to apache service 2013-07-29 21:31:38 +00:00
Alan McNea
22dcf8ee1c Restructured pillar data 2013-07-29 21:31:15 +00:00