Setup /srv/mirrors on all (archvsync-based) mirrors

diff --git a/modules/roles/manifests/archvsync_base.pp b/modules/roles/manifests/archvsync_base.pp
new file mode 100644 (file)
index 0000000..513c8fc
--- /dev/null
+++ b/modules/roles/manifests/archvsync_base.pp
@@ -0,0 +1,15 @@
+class roles::archvsync_base {
+       file { '/srv/mirrors':
+               ensure => directory,
+               owner  => 1176,
+               group  => 1176,
+               mode   => '0755',
+               links  => follow,
+       }
+
+       file { '/srv/mirrors/.nobackup':
+               ensure  => present,
+               content => '',
+               mode    => '0444',
+       }
+}

diff --git a/modules/roles/manifests/debug_mirror.pp b/modules/roles/manifests/debug_mirror.pp
index abe9fd1..6ff82cb 100644 (file)
--- a/modules/roles/manifests/debug_mirror.pp
+++ b/modules/roles/manifests/debug_mirror.pp
@@ -1,4 +1,6 @@
 class roles::debug_mirror {
+       include roles::archvsync_base
+
        $vhost_listen = $::hostname ? {
                klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
                mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 95fd87d..7895c66 100644 (file)
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,5 +1,5 @@
 class roles::ftp {
-
+       include roles::archvsync_base
        include ferm::ftp_conntrack
 
        $bind = $::hostname ? {

diff --git a/modules/roles/manifests/historical_mirror.pp b/modules/roles/manifests/historical_mirror.pp
index f54ebb9..8538481 100644 (file)
--- a/modules/roles/manifests/historical_mirror.pp
+++ b/modules/roles/manifests/historical_mirror.pp
@@ -1,4 +1,5 @@
 class roles::historical_mirror {
+       include roles::archvsync_base
        include apache2::expires
 
        $vhost_listen = $::hostname ? {

diff --git a/modules/roles/manifests/ports_mirror.pp b/modules/roles/manifests/ports_mirror.pp
index 0152dad..bd0d6c1 100644 (file)
--- a/modules/roles/manifests/ports_mirror.pp
+++ b/modules/roles/manifests/ports_mirror.pp
@@ -1,4 +1,6 @@
 class roles::ports_mirror {
+       include roles::archvsync_base
+
        $vhost_listen = $::hostname ? {
                klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
                mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 470fb4a..bb35ff8 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,4 +1,6 @@
 class roles::security_mirror {
+       include roles::archvsync_base
+
        $rsync_bind = $::hostname ? {
                mirror-anu => '150.203.164.61',
                mirror-isc => '149.20.4.14',
@@ -53,7 +55,6 @@ class roles::security_mirror {
                bind6       => $rsync_bind6,
        }
 
-
        $onion_v4_addr = $::hostname ? {
                mirror-anu => '150.203.164.61',
                mirror-isc => '149.20.4.14',

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 5aa4fde..62430bf 100644 (file)
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -1,4 +1,6 @@
 class roles::syncproxy {
+       include roles::archvsync_base
+
        $bind = $::hostname ? {
                'milanollo' => '5.153.231.9',
                'mirror-anu' => '150.203.164.60',