Move /usr/local/bin/static-update-component from static_source to statice_base, and...

diff --git a/modules/roles/manifests/static_base.pp b/modules/roles/manifests/static_base.pp
index 8a92526..95ad7d9 100644 (file)
--- 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 5dcb326..b3b8bb4 100644 (file)
--- 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 c4bc440..c30b0c3 100644 (file)
--- 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',
-       }
 }