saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
337 Commits 6 Branches 31 Tags 1.8 MiB
a7f66b6344
Commit Graph

337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth House
67b8518e47 Added explanatory comment to the apache restart/reload module.wait states 2014-08-06 17:08:14 -04:00
Seth House
448c4855ce Revert "Updated README with new formula conventions URL" 
This reverts commit f7b14ec169.
 2014-08-06 17:08:14 -04:00
Seth House
f7b14ec169 Updated README with new formula conventions URL 2014-08-06 17:06:33 -04:00
Seth House
2c499ee376 Merge pull request #26 from vincentfretin/patch-1 
Don't execute a2ensite if the vhost is already enabled
 2014-08-01 10:56:03 -06:00
Vincent Fretin
541360a0ce use test -f instead of ls in register_site.sls too 2014-08-01 15:39:32 +02:00
Vincent Fretin
0aec048eaf use test -f instead of ls 2014-08-01 15:32:40 +02:00
vincentfretin
18d8c0c0fb Don't execute a2ensite if the vhost is already enabled 2014-08-01 10:43:04 +02:00
Forrest
b034debeca Merge pull request #24 from ev0rtex/patch-1 
Fix link to instructions
 2014-06-30 15:37:15 -07:00
David Warkentin
49a79bd549 Fix link to instructions 
The link to the installation and usage instructions does not work. This fixes it.
 2014-06-30 14:39:52 -06:00
Seth House
65c57dc315 Remove full Pillar example from README; see pillar.example instead 2014-06-18 13:53:01 -06:00
Seth House
280ea54a65 Removed Jinja-esque placeholders from example Pillar; added instructions 
The structure of this example file was quite confusing. Most of these
values are not required and should be denoted as such. Jinja notiation
to denote re-used Pillar values was also a bad and confusing choice.

Closes #8
 2014-06-18 13:50:17 -06:00
Seth House
b8f7ac33bf Moved all Pillar examples under the same dictionary key 
Having multiple different examples in the same file was causing
confusion.
 2014-06-18 13:50:03 -06:00
Joseph Hall
041fac4f48 Merge pull request #23 from mpeeters/patch-1 
Fix typo
 2014-06-01 11:08:17 -06:00
Martin Peeters
b74df1871b Fix typo 2014-06-01 12:13:54 +02:00
Seth House
2db91119af Combined multiple extend statements 
Fixes #22
 2014-03-10 11:53:34 -06:00
Seth House
6457ae9e86 Use long-form state declaration 2014-03-04 11:13:26 -08:00
Joseph Hall
989ae09576 Merge pull request #20 from adamherzog/redhat-vhost-config-extension 
Add vhost config file extension for RedHat-based distributions
 2014-02-09 07:47:14 -07:00
Adam Herzog
6a7448cb4b Add confext (and missing vhostdir) parameters to pillar.example. 2014-02-09 09:13:00 -05:00
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