From cb2e9607cf2092ee657889e2eaee4224eadd7bfe Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 21 Sep 2017 17:12:00 +0200 Subject: [PATCH] Create /srv/static.debian.org on static mirrors and masters (not on sources) --- modules/roles/manifests/static_master.pp | 2 +- modules/roles/manifests/static_mirror.pp | 1 + modules/roles/manifests/static_srvdir.pp | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 modules/roles/manifests/static_srvdir.pp diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp index c2aec647b..ab561abb2 100644 --- a/modules/roles/manifests/static_master.pp +++ b/modules/roles/manifests/static_master.pp @@ -1,6 +1,6 @@ class roles::static_master { - 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 b3b8bb439..68fbfe846 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -1,5 +1,6 @@ class roles::static_mirror { include roles::static_base + include roles::static_srvdir include apache2::expires include apache2::rewrite diff --git a/modules/roles/manifests/static_srvdir.pp b/modules/roles/manifests/static_srvdir.pp new file mode 100644 index 000000000..3ebffbec9 --- /dev/null +++ b/modules/roles/manifests/static_srvdir.pp @@ -0,0 +1,8 @@ +class roles::static_base { + file { '/srv/static.debian.org': + ensure => directory, + mode => '0755', + owner => 'staticsync', + group => 'staticsync', + } +} -- 2.20.1