From: Julien Cristau <jcristau@debian.org>
Date: Sat, 24 Sep 2016 17:07:39 +0000 (+0200)
Subject: Remove extra .conf from apache config file
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=fbe0da36ab4e9e1c76f0b4cff52d3d8ce3fc5d43;p=mirror%2Fdsa-puppet.git

Remove extra .conf from apache config file

apache2::config already adds .conf to the file name.
---

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index ce7f03e97..784d53baf 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -52,6 +52,9 @@ class roles::static_mirror {
 	}
 
 	apache2::config { 'local-static-vhost.conf':
+		ensure => absent,
+	}
+	apache2::config { 'local-static-vhost':
 		content => template('roles/static-mirroring/static-vhost.conf.erb'),
 	}