Create /srv/static.debian.org on static mirrors and masters (not on sources)

diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp
index c2aec64..ab561ab 100644 (file)
--- 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 b3b8bb4..68fbfe8 100644 (file)
--- 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 (file)
index 0000000..3ebffbe
--- /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',
+       }
+}