From 90120d6e7d90309557a19dcfe25e9766c0b24906 Mon Sep 17 00:00:00 2001 From: Joel Smith Date: Thu, 17 Mar 2016 17:58:21 +0000 Subject: [PATCH] Check for ubuntu for apache_confd Ubuntu uses /etc/apache2/conf-enabled for custom config --- manifests/params.pp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/manifests/params.pp b/manifests/params.pp index eb415fff..8aee01b3 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -8,9 +8,14 @@ case $::osfamily { 'Debian': { + if $::operatingsystem == ubuntu { + $apache_confd = '/etc/apache2/conf-enabled' + } else { $apache_confd = '/etc/apache2/conf.d' + } $apache_service = 'apache2' } + 'RedHat': { $apache_confd = '/etc/httpd/conf.d' $apache_service = 'httpd'