From 0d7b149fd5c154299e1a317fc6e192573cc71db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Paw=C5=82owski?= Date: Wed, 22 Jul 2015 10:13:38 +0200 Subject: [PATCH] Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat. --- apache/config.sls | 9 +++++++++ apache/map.jinja | 1 + 2 files changed, 10 insertions(+) diff --git a/apache/config.sls b/apache/config.sls index b75d97d..f4faa20 100644 --- a/apache/config.sls +++ b/apache/config.sls @@ -24,3 +24,12 @@ include: - watch_in: - service: apache {% endif %} + +{% if grains['os_family']=="RedHat" %} +/etc/httpd/conf.d/welcome.conf: + file.absent: + - require: + - pkg: apache + - watch_in: + - service: apache +{% endif %} diff --git a/apache/map.jinja b/apache/map.jinja index 3c2f598..8f358d9 100644 --- a/apache/map.jinja +++ b/apache/map.jinja @@ -23,6 +23,7 @@ 'configfile': '/etc/httpd/conf/httpd.conf', 'mod_wsgi': 'mod_wsgi', + 'mod_php5': 'php', 'vhostdir': '/etc/httpd/conf.d', 'confdir': '/etc/httpd/conf.d',