aboutsummaryrefslogtreecommitdiffstats
path: root/modules/apache
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-04-02 11:05:32 +0000
committerMichael Scherer <misc@mageia.org>2012-04-02 11:05:32 +0000
commit2781f3c5b9174a2ff0c804a913835dde66926aac (patch)
treebba986b471ffb38ae92fb0269d15f61fba1f8dd4 /modules/apache
parente2f975cb32547481c7e738cace675fdc1aee272c (diff)
downloadpuppet-2781f3c5b9174a2ff0c804a913835dde66926aac.tar
puppet-2781f3c5b9174a2ff0c804a913835dde66926aac.tar.gz
puppet-2781f3c5b9174a2ff0c804a913835dde66926aac.tar.bz2
puppet-2781f3c5b9174a2ff0c804a913835dde66926aac.tar.xz
puppet-2781f3c5b9174a2ff0c804a913835dde66926aac.zip
move the template into a subdirectory ( cleaner )
Diffstat (limited to 'modules/apache')
-rw-r--r--modules/apache/manifests/mod/ssl.pp2
-rw-r--r--modules/apache/templates/mod/ssl.conf (renamed from modules/apache/templates/ssl.conf)0
2 files changed, 1 insertions, 1 deletions
diff --git a/modules/apache/manifests/mod/ssl.pp b/modules/apache/manifests/mod/ssl.pp
index 8ebb382d..6e9be525 100644
--- a/modules/apache/manifests/mod/ssl.pp
+++ b/modules/apache/manifests/mod/ssl.pp
@@ -15,6 +15,6 @@ class apache::mod::ssl {
'/etc/httpd/conf/vhosts.d/01_default_ssl_vhost.conf':
content => template('apache/01_default_ssl_vhost.conf');
'/etc/httpd/conf.d/ssl.conf':
- content => template('apache/ssl.conf');
+ content => template('apache/mod/ssl.conf');
}
}
diff --git a/modules/apache/templates/ssl.conf b/modules/apache/templates/mod/ssl.conf
index bcfe8201..bcfe8201 100644
--- a/modules/apache/templates/ssl.conf
+++ b/modules/apache/templates/mod/ssl.conf