Copied: puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf (from rev 290, puppet/modules/bugzilla/templates/vhost_mageia.org.conf)
===================================================================
--- puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf (rev 0)
+++ puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf 2010-11-18 20:26:30 UTC (rev 292)
@@ -0,0 +1,13 @@
+<%
+path_data_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/bugzilla"
+%>
+
+<VirtualHost *:80>
+ ServerName bugs.<%= domain %>
+ DocumentRoot /usr/share/bugzilla/www
+ Alias /bugzilla/data <%= path_data_directory %>
+ Alias /bugzilla /usr/share/bugzilla/www
+ <Location />
+ Allow from all
+ </Location>
+</VirtualHost>
Deleted: puppet/modules/bugzilla/templates/vhost_mageia.org.conf
===================================================================
--- puppet/modules/bugzilla/templates/vhost_mageia.org.conf 2010-11-18 20:23:56 UTC (rev 291)
+++ puppet/modules/bugzilla/templates/vhost_mageia.org.conf 2010-11-18 20:26:30 UTC (rev 292)
@@ -1,13 +0,0 @@
-<%
-path_data_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/bugzilla"
-%>
-
-<VirtualHost *:80>
- ServerName bugs.<%= domain %>
- DocumentRoot /usr/share/bugzilla/www
- Alias /bugzilla/data <%= path_data_directory %>
- Alias /bugzilla /usr/share/bugzilla/www
- <Location />
- Allow from all
- </Location>
-</VirtualHost>