Modified: puppet/modules/sympa/manifests/init.pp
===================================================================
--- puppet/modules/sympa/manifests/init.pp 2010-11-18 17:22:21 UTC (rev 283)
+++ puppet/modules/sympa/manifests/init.pp 2010-11-18 17:42:50 UTC (rev 284)
@@ -32,7 +32,7 @@
}
apache::vhost_other_app { "ml.$domain":
- vhost_file => "sympa/vhost_sympa.mageia.org.conf",
+ vhost_file => "sympa/vhost_ml.conf",
}
}
Copied: puppet/modules/sympa/templates/vhost_ml.conf (from rev 283, puppet/modules/sympa/templates/vhost_sympa.mageia.org.conf)
===================================================================
--- puppet/modules/sympa/templates/vhost_ml.conf (rev 0)
+++ puppet/modules/sympa/templates/vhost_ml.conf 2010-11-18 17:42:50 UTC (rev 284)
@@ -0,0 +1,7 @@
+<VirtualHost *:80>
+ ServerName ml.<%= domain %>
+ DocumentRoot /usr/lib64/sympa/cgi
+ <Location />
+ Allow from all
+ </Location>
+</VirtualHost>
Deleted: puppet/modules/sympa/templates/vhost_sympa.mageia.org.conf
===================================================================
--- puppet/modules/sympa/templates/vhost_sympa.mageia.org.conf 2010-11-18 17:22:21 UTC (rev 283)
+++ puppet/modules/sympa/templates/vhost_sympa.mageia.org.conf 2010-11-18 17:42:50 UTC (rev 284)
@@ -1,7 +0,0 @@
-<VirtualHost *:80>
- ServerName ml.<%= domain %>
- DocumentRoot /usr/lib64/sympa/cgi
- <Location />
- Allow from all
- </Location>
-</VirtualHost>