From 396da52d807c0e1d110ba60ba093d27c70234630 Mon Sep 17 00:00:00 2001
From: Olivier Blin <dev@blino.org>
Date: Sun, 22 Nov 2015 02:01:32 +0100
Subject: apache: rename ssl.conf as ssl_vhost.conf

Not to conflict with packaged file from Mageia >= 3
---
 modules/apache/manifests/mod/ssl.pp         | 4 ++--
 modules/apache/templates/mod/ssl.conf       | 1 -
 modules/apache/templates/mod/ssl_vhost.conf | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 modules/apache/templates/mod/ssl.conf
 create mode 100644 modules/apache/templates/mod/ssl_vhost.conf

(limited to 'modules/apache')

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.conf
deleted file mode 100644
index bcfe8201..00000000
--- a/modules/apache/templates/mod/ssl.conf
+++ /dev/null
@@ -1 +0,0 @@
-NameVirtualHost *:443
diff --git a/modules/apache/templates/mod/ssl_vhost.conf b/modules/apache/templates/mod/ssl_vhost.conf
new file mode 100644
index 00000000..bcfe8201
--- /dev/null
+++ b/modules/apache/templates/mod/ssl_vhost.conf
@@ -0,0 +1 @@
+NameVirtualHost *:443
-- 
cgit v1.2.1