Merge remote-tracking branch 'waldi/rsync-systemd-master'

* waldi/rsync-systemd-master:
  Use rsyncd via system on security_master
  Use rsyncd via systemd on ftp_master
  Use rsyncd via systemd on archive_master

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 6fe002f..bcfc622 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -32,6 +32,7 @@ roles:
   extranrpeclient:
     - denis.debian.org
   ftp.d.o:
+    # also see debian_mirror
     - klecker.debian.org
   ftp_master:
     - fasolo.debian.org
@@ -210,6 +211,7 @@ roles:
   sreview.debian.org:
     - vittoria.debian.org
   debian_mirror:
+    # - klecker.debian.org
     - bilbao.debian.org
     - boman.debian.org
     - mirror-isc.debian.org

diff --git a/modules/roles/manifests/archvsync_base.pp b/modules/roles/manifests/archvsync_base.pp
new file mode 100644 (file)
index 0000000..9e9176a
--- /dev/null
+++ b/modules/roles/manifests/archvsync_base.pp
@@ -0,0 +1,14 @@
+class roles::archvsync_base {
+       file { '/srv/mirrors':
+               ensure => directory,
+               owner  => root,
+               group  => 1176, # archvsync
+               mode   => '0775',
+               # links  => follow,
+       }
+
+       file { '/srv/mirrors/.nobackup':
+               ensure  => present,
+               content => '',
+       }
+}

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..a7870cb 100644 (file)
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,5 +1,7 @@
 class roles::ftp {
+       # this is the FTP part of the roles::debian_mirror class
 
+       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..a2d5aee 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',
@@ -20,6 +22,11 @@ class roles::security_mirror {
                default => undef,
        }
 
+       file { '/srv/mirrors/debian-security':
+               ensure => link,
+               target => '../ftp.root/debian-security',
+       }
+
        include apache2::expires
        include apache2::rewrite
 
@@ -53,7 +60,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',