From 885b1390848612043dfe4656dd447989ac7555fe Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 8 Sep 2019 09:11:05 +0200 Subject: [PATCH] Move the non-roles static_base and static_srvdir to static/ --- modules/roles/manifests/{static_base.pp => static/base.pp} | 2 +- modules/roles/manifests/{ => static}/static_srvdir.pp | 2 +- modules/roles/manifests/static_master.pp | 4 ++-- modules/roles/manifests/static_mirror.pp | 4 ++-- modules/roles/manifests/static_source.pp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename modules/roles/manifests/{static_base.pp => static/base.pp} (98%) rename modules/roles/manifests/{ => static}/static_srvdir.pp (90%) diff --git a/modules/roles/manifests/static_base.pp b/modules/roles/manifests/static/base.pp similarity index 98% rename from modules/roles/manifests/static_base.pp rename to modules/roles/manifests/static/base.pp index e598a6e09..7752f43ba 100644 --- a/modules/roles/manifests/static_base.pp +++ b/modules/roles/manifests/static/base.pp @@ -1,5 +1,5 @@ # the base class defining tings common for all three static classes (master, mirror, source) -class roles::static_base { +class roles::static::base { ssh::keygen {'staticsync': } ssh::authorized_key_add { 'staticsync': target_user => 'staticsync', diff --git a/modules/roles/manifests/static_srvdir.pp b/modules/roles/manifests/static/static_srvdir.pp similarity index 90% rename from modules/roles/manifests/static_srvdir.pp rename to modules/roles/manifests/static/static_srvdir.pp index 5a87bd31a..7fef3830c 100644 --- a/modules/roles/manifests/static_srvdir.pp +++ b/modules/roles/manifests/static/static_srvdir.pp @@ -1,5 +1,5 @@ # create the directory on static hosts and disable backups -class roles::static_srvdir { +class roles::static::srvdir { file { '/srv/static.debian.org': ensure => directory, mode => '0755', diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp index bb4875774..60c0c15ac 100644 --- a/modules/roles/manifests/static_master.pp +++ b/modules/roles/manifests/static_master.pp @@ -4,8 +4,8 @@ # to the master, and from there to all the mirrors. # class roles::static_master { - include roles::static_base - include roles::static_srvdir + include roles::static::base + include roles::static::srvdir file { '/usr/local/bin/static-master-run': source => 'puppet:///modules/roles/static-mirroring/static-master-run', diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index 4b4c4085f..a526f07a9 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -2,8 +2,8 @@ # # this receives pushes from the master and then usually serves the content to the public class roles::static_mirror { - include roles::static_base - include roles::static_srvdir + include roles::static::base + include roles::static::srvdir include apache2::expires include apache2::rewrite diff --git a/modules/roles/manifests/static_source.pp b/modules/roles/manifests/static_source.pp index b34db3f3d..5929b821a 100644 --- a/modules/roles/manifests/static_source.pp +++ b/modules/roles/manifests/static_source.pp @@ -2,5 +2,5 @@ # # origin of static content. From here it goes to the static master before that one pushes it to the mirrors class roles::static_source { - include roles::static_base + include roles::static::base } -- 2.20.1