From 5e58debe8ae92c6372f3028535296818d341fc75 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 21 Sep 2017 17:08:57 +0200 Subject: [PATCH] Move /usr/local/bin/static-update-component from static_source to statice_base, and have static_mirror include static_base instead of static_source --- modules/roles/manifests/static_base.pp | 6 ++++++ modules/roles/manifests/static_mirror.pp | 3 +-- modules/roles/manifests/static_source.pp | 6 ------ 3 files changed, 7 insertions(+), 8 deletions(-) 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', - } } -- 2.20.1