Brad Thurber
24698575f1
add space before grep module check
2015-10-20 13:41:51 -04:00
puneet kandhari
663b80724f
Merge pull request #84 from eliasp/missing-confext
...
Add missing context
2015-10-08 06:32:18 -05:00
Elias Probst
293b68b939
Add missing context
2015-10-08 12:31:47 +02:00
puneet kandhari
4c02ae7004
Merge pull request #83 from morsik/patch-1
...
Added CentOS and Oracle Linux versions mapping
2015-10-03 09:40:58 -05:00
Konrad Mosoń
f07f672ed1
Added CentOS and Oracle Linux versions mapping
2015-10-03 15:44:45 +02:00
puneet kandhari
c6413a361c
Merge pull request #82 from eliasp/patch-1
...
Don't execute `a2dissite` on each state run
2015-09-25 04:58:44 -05:00
Elias Probst
ff2dd397c3
Don't execute a2dissite on each state run
...
Add `onlyif` check to execute `a2dissite` only when needed.
2015-09-25 09:34:28 +02:00
puneet kandhari
92cc127bfe
Merge pull request #81 from jcristau/no-documentroot
...
allow absence of DocumentRoot
2015-09-21 09:17:49 -05:00
Julien Cristau
9be8ade5aa
allow absence of DocumentRoot
...
DocumentRoot is useless for a plain redirect or proxy vhost, no need to
force creating the directory.
Signed-off-by: Julien Cristau <julien.cristau@logilab.fr>
2015-09-21 15:47:46 +02:00
Nitin Madhok
9bd6873d27
Merge pull request #80 from eliasp/a2tools-confext
...
a2(en|dis)site requires the full name incl. the confext.
2015-08-28 10:17:36 -04:00
Elias Probst
0ed941bd4e
a2(en|dis)site requires the full name incl. the confext.
2015-08-28 16:01:38 +02:00
puneet kandhari
7406e62d23
Merge pull request #78 from eliasp/correct-confext-usage
...
Use 'apache.confext' instead of hardcoding '.conf'
2015-08-28 07:39:43 -05:00
Elias Probst
873d86cadb
Use 'apache.confext' instead of hardcoding '.conf'
2015-08-28 13:25:21 +02:00
puneet kandhari
d01b7cc66e
Merge pull request #77 from bradthurber/add_apache_version
...
Add apache version to pillar/map.jinja
2015-08-26 08:15:11 -05:00
Brad Thurber
e5c1209433
This branch is foundational for further version-specific work to come.
...
* Add apache version (2.2, 2.4) detection based on osfinger (defaults to 2.4).
* Version can be overridden in pillar (for Apache 2.4 on RHEL 6 for example)
2015-08-26 08:49:43 -04:00
puneet kandhari
75304c160c
Merge pull request #76 from bradthurber/add-lookup-to-pillar
...
add lookup section to pillar.example
2015-08-26 07:25:44 -05:00
Brad Thurber
13fb82c470
add lookup section to pillar.example
2015-08-26 08:05:25 -04:00
Forrest
b6437b15e0
Merge pull request #74 from Wenzel/disable_site
...
add a boolean to a site configuration to enable or disable it
2015-08-25 11:02:29 -07:00
puneet kandhari
3dafac2627
Merge pull request #73 from Wenzel/fix_mod_mpm
...
fix apache-restart ID in apache/mod_mpm according to apache/init.sls
2015-08-25 05:09:49 -05:00
Mathieu Tarral
a7fb2f89fc
add missing {% endif %}
2015-08-25 01:58:22 -04:00
Mathieu Tarral
c195dce07c
add an 'enabled' attribute for a site in pillar
2015-08-25 01:50:58 -04:00
Mathieu Tarral
a88611c1d0
fix apache-restart ID in apache/mod_mpm according to apache/init.sls
2015-08-25 01:42:08 -04:00
puneet kandhari
b59ef46304
Merge pull request #72 from wido/fix_register_site
...
Files in sites-available should end with .conf under Ubuntu
2015-08-21 12:19:06 -05:00
Wido den Hollander
def448db2f
Files in sites-available should end with .conf under Ubuntu
2015-08-21 17:11:45 +02:00
puneet kandhari
e84b76ab01
Merge pull request #71 from bradthurber/find_wildcard_paths_should_be_quoted
...
quote wildcard paths
2015-08-19 12:20:26 -05:00
Brad Thurber
0ced6e4cf0
quote wildcard paths
2015-08-19 10:41:53 -04:00
puneet kandhari
25179778ed
Merge pull request #68 from msciciel/msciciel
...
RedHat fixes: change default vhostdir to redhat official
2015-07-22 08:07:48 -05:00
Krzysztof Pawłowski
b6fe515ed8
RedHat fixes: change default vhostdir to redhat official default /etc/httpd/vhosts.d, add state for ensuring that vhostdir exists, include vhosts.d/*.conf in httpd.conf
2015-07-22 14:36:25 +02:00
Nitin Madhok
954a39e0cd
Merge pull request #67 from msciciel/msciciel
...
Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat.
2015-07-22 05:07:04 -04:00
Krzysztof Pawłowski
0d7b149fd5
Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat.
2015-07-22 10:13:38 +02:00
puneet kandhari
9d72208524
Merge pull request #66 from madssj/fix-syntax-error
...
Fixed missing : and uppercased D in debian
2015-07-08 08:39:07 -05:00
Mads Sülau Jørgensen
4741f58a25
Fixed missing : and uppercased D in debian
2015-07-08 15:33:19 +02:00
Brian Jackson
26334430da
Merge pull request #65 from techhat/master
...
Initial commit of SPM FORMULA
2015-07-07 12:25:52 -05:00
Joseph Hall
e0ce473b81
Initial commit of SPM FORMULA
2015-07-07 09:45:40 -06:00
puneet kandhari
513bc04861
Merge pull request #62 from saltstack-formulas/revert-61-master
...
Revert "corrected the key to match the pillar.example"
2015-06-23 12:34:06 -05:00
Forrest
b839a7e30b
Revert "corrected the key to match the pillar.example"
2015-06-23 10:30:16 -07:00
Forrest
32c492dbae
Merge pull request #61 from papoyan/master
...
corrected the key to match the pillar.example
2015-06-23 10:29:40 -07:00
Papoyan, Nerses
023c2873b1
corrected the key to match the pillar.example
2015-06-23 11:35:55 -04:00
puneet kandhari
f34b239202
Merge pull request #60 from Thingks/master
...
Correct variable name
2015-06-19 16:01:51 -05:00
Rico Moorman
1a2d22b2e8
Correct variable name
2015-06-19 22:55:30 +02:00
puneet kandhari
114bb34fc4
Merge pull request #59 from aboe76/master
...
Improvements to the apache-formula
2015-06-19 14:03:51 -05:00
Niels Abspoel
53b995a680
Improved apache-formula
...
- Added more modules and configuration options
- Renamed sls files to reflect what they do.
- added mpm options for Debian
2015-06-19 20:44:53 +02:00
Niels Abspoel
f6a0c84544
Merge pull request #56 from thornycrackers/master
...
Create defaul vhost directories when DocumentRoot is not set
2015-06-17 16:11:29 +02:00
Forrest
e10003b077
Merge pull request #58 from multani/proxy-ssl
...
Add support for SSL certificates in the proxy template
2015-06-09 10:25:01 -07:00
Jonathan Ballet
a8f2d89995
ssl: also support the SSLCertificateChainFile required by some providers
2015-06-09 11:54:07 +02:00
Jonathan Ballet
c9d9d954de
proxy: support SSL certificate in the proxy template
2015-06-09 11:48:35 +02:00
Cody Hiar
45de7301a7
Updated README to note that directories are created when using
...
apache.vhosts.standard
2015-06-01 19:16:24 -06:00
Cody Hiar
07b2a9f9f5
Create defaul vhost directories when DocumentRoot is not set
2015-05-31 12:17:25 -06:00
puneet kandhari
fffb47518e
Merge pull request #55 from mosen/master
...
Fix SSL: incorrect syntax in pillar example and jinja template
2015-05-14 00:00:39 -07:00
Mosen
d4b1af0af4
Fix unnecessary comparison against boolean in vhosts/standard.tmpl
2015-05-14 16:55:11 +10:00
