From 8cdcd6074517f143c7f8e9824a01a4ffa50cff12 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Thu, 18 Nov 2010 17:42:50 +0000
Subject: rename vhost template filename

---
 modules/sympa/manifests/init.pp                     | 2 +-
 modules/sympa/templates/vhost_ml.conf               | 7 +++++++
 modules/sympa/templates/vhost_sympa.mageia.org.conf | 7 -------
 3 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 modules/sympa/templates/vhost_ml.conf
 delete mode 100644 modules/sympa/templates/vhost_sympa.mageia.org.conf

(limited to 'modules/sympa')

diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp
index 11543193..d97560fa 100644
--- a/modules/sympa/manifests/init.pp
+++ b/modules/sympa/manifests/init.pp
@@ -32,7 +32,7 @@ class sympa {
     }
 
    apache::vhost_other_app { "ml.$domain":
-        vhost_file => "sympa/vhost_sympa.mageia.org.conf",
+        vhost_file => "sympa/vhost_ml.conf",
    }
 }
 
diff --git a/modules/sympa/templates/vhost_ml.conf b/modules/sympa/templates/vhost_ml.conf
new file mode 100644
index 00000000..0b2502b0
--- /dev/null
+++ b/modules/sympa/templates/vhost_ml.conf
@@ -0,0 +1,7 @@
+<VirtualHost *:80>
+	ServerName ml.<%= domain %>
+	DocumentRoot /usr/lib64/sympa/cgi
+	<Location />
+		Allow from all
+	</Location>
+</VirtualHost>
diff --git a/modules/sympa/templates/vhost_sympa.mageia.org.conf b/modules/sympa/templates/vhost_sympa.mageia.org.conf
deleted file mode 100644
index 0b2502b0..00000000
--- a/modules/sympa/templates/vhost_sympa.mageia.org.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-<VirtualHost *:80>
-	ServerName ml.<%= domain %>
-	DocumentRoot /usr/lib64/sympa/cgi
-	<Location />
-		Allow from all
-	</Location>
-</VirtualHost>
-- 
cgit v1.2.1