From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 17 Apr 2013 21:48:00 +0000 (+0200)
Subject: Part I of web log shipping, II
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a78962b260c998271af97893d9f8db257386f728;p=mirror%2Fdsa-puppet.git

Part I of web log shipping, II
---

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index c98464c37..8dd1bb850 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -2,13 +2,14 @@ class roles::static_mirror {
 
 	include roles::static_source
 
-	package { 'libapache2-mod-macro':
-		ensure => installed,
-	}
+	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 { 'expires': }
+	apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
 
 	file { '/usr/local/bin/static-mirror-run':
 		source => 'puppet:///modules/roles/static-mirroring/static-mirror-run',