From 8ca2bfc365e738d1d524fcae07eb984f5eb69cc9 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Tue, 19 Jun 2012 10:44:07 -0700
Subject: [PATCH] Change mailman template destination.

Change-Id: Ieb4ff0c92e6dd4fc31940cb314fc98b825c01600
---
 manifests/site.pp                 | 12 ------------
 modules/mailman/manifests/init.pp | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 89a070f96a..bbbc25ee51 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -347,18 +347,6 @@ node "lists.openstack.org" {
   realize (
     User::Virtual::Localuser["oubiwann"],
   )
-
-  file { '/usr/share/mailman/en':
-    owner => 'root',
-    group => 'list',
-    mode => 644,
-    ensure => 'directory',
-    recurse => true,
-    require => Package['mailman'],
-    source => [
-                "puppet://modules/mailman/html-templates-en",
-              ],
-  }
 }
 
 node "docs.openstack.org" {
diff --git a/modules/mailman/manifests/init.pp b/modules/mailman/manifests/init.pp
index 4fa1f1c3c6..688e55e7ca 100644
--- a/modules/mailman/manifests/init.pp
+++ b/modules/mailman/manifests/init.pp
@@ -71,4 +71,16 @@ class mailman($mailman_host='') {
     subscribe       => File["/etc/apache2/sites-available/mailman"],
     require         => Package["apache2"]
   }
+
+  file { '/etc/mailman/en':
+    owner => 'root',
+    group => 'list',
+    mode => 644,
+    ensure => 'directory',
+    recurse => true,
+    require => Package['mailman'],
+    source => [
+                "puppet://modules/mailman/html-templates-en",
+              ],
+  }
 }