aboutsummaryrefslogtreecommitdiffstats
path: root/modules/apache
diff options
context:
space:
mode:
authorOlivier Blin <dev@blino.org>2015-11-22 02:01:32 +0100
committerOlivier Blin <dev@blino.org>2015-11-30 01:32:43 +0100
commit396da52d807c0e1d110ba60ba093d27c70234630 (patch)
tree04f36153a683c36059850c37fb99dab3c531d6ba /modules/apache
parent4ea01996296a668431f932c290ed9bee79776c05 (diff)
downloadpuppet-396da52d807c0e1d110ba60ba093d27c70234630.tar
puppet-396da52d807c0e1d110ba60ba093d27c70234630.tar.gz
puppet-396da52d807c0e1d110ba60ba093d27c70234630.tar.bz2
puppet-396da52d807c0e1d110ba60ba093d27c70234630.tar.xz
puppet-396da52d807c0e1d110ba60ba093d27c70234630.zip
apache: rename ssl.conf as ssl_vhost.conf
Not to conflict with packaged file from Mageia >= 3
Diffstat (limited to 'modules/apache')
-rw-r--r--modules/apache/manifests/mod/ssl.pp4
-rw-r--r--modules/apache/templates/mod/ssl_vhost.conf (renamed from modules/apache/templates/mod/ssl.conf)0
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/apache/manifests/mod/ssl.pp b/modules/apache/manifests/mod/ssl.pp
index 6e9be525..9065c5cc 100644
--- a/modules/apache/manifests/mod/ssl.pp
+++ b/modules/apache/manifests/mod/ssl.pp
@@ -14,7 +14,7 @@ class apache::mod::ssl {
apache::config {
'/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/mod/ssl.conf');
+ '/etc/httpd/conf.d/ssl_vhost.conf':
+ content => template('apache/mod/ssl_vhost.conf');
}
}
diff --git a/modules/apache/templates/mod/ssl.conf b/modules/apache/templates/mod/ssl_vhost.conf
index bcfe8201..bcfe8201 100644
--- a/modules/apache/templates/mod/ssl.conf
+++ b/modules/apache/templates/mod/ssl_vhost.conf