From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 8 Mar 2017 12:24:17 +0000 (+0100)
Subject: rename pratchett to headers
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5af92d6004a3cca0957e8634acb5caf883d90b8d;p=mirror%2Fdsa-puppet.git

rename pratchett to headers
---

diff --git a/modules/apache2/files/headers b/modules/apache2/files/headers
new file mode 100644
index 000000000..f5bb06f8c
--- /dev/null
+++ b/modules/apache2/files/headers
@@ -0,0 +1,3 @@
+<IfModule mod_headers.c>
+  Header set X-Clacks-Overhead "GNU Terry Pratchett"
+</IfModule>
diff --git a/modules/apache2/files/pratchett b/modules/apache2/files/pratchett
deleted file mode 100644
index f5bb06f8c..000000000
--- a/modules/apache2/files/pratchett
+++ /dev/null
@@ -1,3 +0,0 @@
-<IfModule mod_headers.c>
-  Header set X-Clacks-Overhead "GNU Terry Pratchett"
-</IfModule>
diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 9735570e6..2e7592721 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -90,7 +90,11 @@ class apache2 {
 	}
 
 	apache2::config { 'pratchett':
-		source => 'puppet:///modules/apache2/pratchett',
+		ensure => 'absent',
+	}
+
+	apache2::config { 'headers':
+		source => 'puppet:///modules/apache2/headers',
 	}
 
 	apache2::module { 'mpm_event': ensure => absent }