From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 1 Jan 2014 10:44:10 +0000 (+0100)
Subject: install mod-macro everywhere
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=35590b272f1aec5a4bc48c40fe8a763b3556f411

install mod-macro everywhere
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index dec3162d..a3d47f1a 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,5 +1,4 @@
 class apache2 {
-
 	package { 'apache2':
 		ensure => installed,
 	}
@@ -12,6 +11,14 @@ class apache2 {
 	apache2::module { 'info': }
 	apache2::module { 'status': }
 
+	package { 'libapache2-mod-macro':
+		ensure => installed
+	}
+
+	apache2::module { 'macro':
+		require => Package['libapache2-mod-macro']
+	}
+
 	apache2::site { '00-default':
 		site     => 'default-debian.org',
 		content  => template('apache2/default-debian.org.erb'),
diff --git a/modules/apache2/manifests/macro.pp b/modules/apache2/manifests/macro.pp
deleted file mode 100644
index b25fe97d..00000000
--- a/modules/apache2/manifests/macro.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class apache2::macro {
-	package { 'libapache2-mod-macro':
-		ensure => installed
-	}
-
-	apache2::module { 'macro':
-		require => Package['libapache2-mod-macro']
-	}
-}
diff --git a/modules/roles/manifests/dakmaster.pp b/modules/roles/manifests/dakmaster.pp
index 7209befb..4624090f 100644
--- a/modules/roles/manifests/dakmaster.pp
+++ b/modules/roles/manifests/dakmaster.pp
@@ -1,11 +1,4 @@
 class roles::dakmaster {
-
-	package { 'libapache2-mod-macro':
-		ensure => installed,
-	}
-
-	apache2::module { 'macro': }
-
 	apache2::config { 'puppet-builddlist':
 		content => template('roles/dakmaster/conf-builddlist.erb'),
 	}
diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 9c4b93b0..cdaa9afb 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -3,11 +3,9 @@ class roles::static_mirror {
 	include roles::static_source
 	include apache2::cache
 
-	package { 'libapache2-mod-macro': ensure => installed, }
 	package { 'libapache2-mod-geoip': ensure => installed, }
 	package { 'geoip-database': ensure => installed, }
 
-	apache2::module { 'macro': require => Package['libapache2-mod-macro']; }
 	apache2::module { 'rewrite': }
 	apache2::module { 'include': }
 	apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }