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

106 Commits

Author SHA1 Message Date
root
dc7970955a Added support for different templates for the config file based on version 2015-12-10 06:54:50 +10:00
Nitin Madhok
c3393a4910 Fixing minor typo 2015-11-23 13:39:28 -05:00
abednarik
b28b61205a Update mod proxy id to avoid conflict when using modules te enable this mod 2015-11-23 15:31:45 -03:00
abednarik
384a3c56c2 Replace deprecated iteritems() with items() 2015-11-22 18:57:56 -03:00
Adrien Bréfort
9e9d6ba4ba Add support for Ubuntu 15.04 and 15.10 in map.jinja. 2015-11-22 12:11:14 +01:00
Carlo Vollebregt
2d39798fbb Added installation support for mod_pagespeed on RedHat: cache and log dir are already created after installation of the mod_pagespeed RPM 2015-11-20 12:33:16 +01:00
Carlo Vollebregt
a3885e6d69 Added installation support for mod_pagespeed on RedHat 2015-11-19 22:04:03 +01:00
Rowcliffe Browne
fd49c2c385 fix for symlink docroot failure 2015-11-17 11:16:24 +08:00
abednarik
a093f8debb CentOS osfingermap update 2015-11-16 17:07:23 -03:00
Dominik Menzi
ea065e3413 Set vhost sites as enabled by default 2015-11-16 11:43:44 +01:00
Brad Thurber
fb2f41afe4 debugging - the \s gets turned into \\s for some reason - so using [[:space:]] instead. This seems to be the grep-favored approach http://stackoverflow.com/questions/4233159/grep-regex-whitespace-behavior 2015-10-20 14:37:22 -04:00
Brad Thurber
9020f8d82a sed needs to allow spaces before LoadModule 2015-10-20 14:03:33 -04:00
Brad Thurber
24698575f1 add space before grep module check 2015-10-20 13:41:51 -04:00
Elias Probst
293b68b939 Add missing context 2015-10-08 12:31:47 +02:00
Konrad Mosoń
f07f672ed1 Added CentOS and Oracle Linux versions mapping 2015-10-03 15:44:45 +02: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
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
Elias Probst
0ed941bd4e a2(en|dis)site requires the full name incl. the confext. 2015-08-28 16:01:38 +02:00
Elias Probst
873d86cadb Use 'apache.confext' instead of hardcoding '.conf' 2015-08-28 13:25:21 +02: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
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
Wido den Hollander
def448db2f Files in sites-available should end with .conf under Ubuntu 2015-08-21 17:11:45 +02:00
Brad Thurber
0ced6e4cf0 quote wildcard paths 2015-08-19 10:41:53 -04: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
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
Mads Sülau Jørgensen
4741f58a25 Fixed missing : and uppercased D in debian 2015-07-08 15:33:19 +02:00
Forrest
b839a7e30b Revert "corrected the key to match the pillar.example" 2015-06-23 10:30:16 -07:00
Papoyan, Nerses
023c2873b1 corrected the key to match the pillar.example 2015-06-23 11:35:55 -04:00
Rico Moorman
1a2d22b2e8 Correct variable name 2015-06-19 22:55:30 +02: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
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
07b2a9f9f5 Create defaul vhost directories when DocumentRoot is not set 2015-05-31 12:17:25 -06:00
Mosen
d4b1af0af4 Fix unnecessary comparison against boolean in vhosts/standard.tmpl 2015-05-14 16:55:11 +10:00
Mosen
f135e2e0d5 Fix incorrect syntax in pillar example for SSLCertificateFile, SSLCertificateKeyFile 
Fix check for SSLCertificateFile, SSLCertificateKeyFile variables in vhosts/standard.tmpl, now using dict.get()
 2015-05-14 12:38:27 +10:00
Elias Probst
1a1104fe80 Set 'confext' for Debian systems. 2015-04-17 14:39:57 +02:00
Forrest
99ea682cfb Merge pull request #52 from daschatten/master 
Add basic SSL functionality.
 2015-04-02 08:52:42 -07:00
Florian Bittner
dbb86f2bc4 Add basic SSL functionality. 2015-04-02 14:23:21 +02:00
Nitin Madhok
231000fd4b Merge pull request #47 from bradthurber/modules.sls-redhat 
make modules.sls compatible with RHEL/CentOS Apache 2.2
 2015-03-26 13:07:08 -04:00
Brad Thurber
5afdcb819c per @gravyboat suggestion, change separate if to elif 2015-03-26 08:00:11 -04:00
Forrest
39176444d1 Merge pull request #48 from multani/fix-jinja-reverse 
Fix Jinja's reverse
 2015-03-25 19:25:38 -07:00
Jonathan Ballet
42426f3f4a Don't fail on missing DocumentRoot 
If the DocumentRoot value wasn't set, applying the state would cause the
following error:

          ID: site.example.com-documentroot
    Function: file.directory
        Name: None
      Result: False
     Comment: Specified file None is not an absolute path
     Started: 15:07:05.596723
    Duration: 4.929 ms
     Changes:

This fixes the problem by not trying to check for the DocumentRoot directory is
the value is missing.
 2015-03-25 15:06:18 +01:00
Jonathan Ballet
74e4c4d7d5 Make proxies order stable 2015-03-25 14:48:13 +01:00
Jonathan Ballet
3f4a7667f7 Jinja's reverse is a filter, use it accordingly 2015-03-25 14:47:55 +01:00
Brad Thurber
0f0d5318e5 make modules.sls compatible with RHEL/CentOS Apache 2.2 2015-03-24 15:41:08 -04:00