From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 21 Sep 2017 15:08:57 +0000 (+0200)
Subject: Move /usr/local/bin/static-update-component from static_source to statice_base, and... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5e58debe8ae92c6372f3028535296818d341fc75;p=mirror%2Fdsa-puppet.git

Move /usr/local/bin/static-update-component from static_source to statice_base, and have static_mirror include static_base instead of static_source
---

diff --git a/modules/roles/manifests/static_base.pp b/modules/roles/manifests/static_base.pp
index 8a9252660..95ad7d962 100644
--- a/modules/roles/manifests/static_base.pp
+++ b/modules/roles/manifests/static_base.pp
@@ -18,6 +18,12 @@ class roles::static_base {
 		source => 'puppet:///modules/roles/static-mirroring/staticsync-ssh-wrap',
 		mode   => '0555',
 	}
+
+	file { '/usr/local/bin/static-update-component':
+		source => 'puppet:///modules/roles/static-mirroring/static-update-component',
+		mode    => '0555',
+	}
+
 	file { '/usr/local/bin/static-mirror-ssh-wrap': ensure => absent; }
 	file { '/usr/local/bin/static-master-ssh-wrap': ensure => absent; }
 
diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 5dcb32636..b3b8bb439 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,6 +1,5 @@
 class roles::static_mirror {
-
-	include roles::static_source
+	include roles::static_base
 	include apache2::expires
 	include apache2::rewrite
 
diff --git a/modules/roles/manifests/static_source.pp b/modules/roles/manifests/static_source.pp
index c4bc4407c..c30b0c33a 100644
--- a/modules/roles/manifests/static_source.pp
+++ b/modules/roles/manifests/static_source.pp
@@ -1,9 +1,3 @@
 class roles::static_source {
-
 	include roles::static_base
-
-	file { '/usr/local/bin/static-update-component':
-		source => 'puppet:///modules/roles/static-mirroring/static-update-component',
-		mode    => '0555',
-	}
 }