From: Bastian Blank <waldi@debian.org>
Date: Sun, 29 Jan 2017 10:55:31 +0000 (+0100)
Subject: Rename roles::ports-master to roles::ports_master
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e83e2d97e5329921a630f5c18fe54a43772d458b;p=mirror%2Fdsa-puppet.git

Rename roles::ports-master to roles::ports_master

Signed-off-by: Peter Palfrader <peter@palfrader.org>
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 8b9c06ef9..42d9045dd 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -242,7 +242,7 @@ roles:
     - delfin.debian.org
   pet.d.n:
     - petrova.debian.org
-  ports-master:
+  ports_master:
     - porta.debian.org
   onionbalance:
     - olin.debian.org
diff --git a/modules/roles/files/ports-master/rsyncd.conf b/modules/roles/files/ports-master/rsyncd.conf
deleted file mode 100644
index baa128d16..000000000
--- a/modules/roles/files/ports-master/rsyncd.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-uid = nobody
-gid = nogroup
-max connections = 25
-syslog facility = daemon
-socket options = SO_KEEPALIVE
-timeout = 7200
-log file = /var/log/rsyncd/rsyncd-ports-master.log
-
-[debian-ports]
-  path = /srv/ports-master.debian.org/ftp/debian-ports
-  comment = debian-ports tree - see https://www.ports.debian.org/
-  auth users = *
-  read only = true
-  ignore nonreadable = true
-  secrets file = /home/archvsync/rsyncd/debian-ports.secrets
-  strict modes = false
-
-[debian-ports-cd]
-  path = /srv/ports-master.debian.org/ftp/debian-ports-cd
-  comment = debian-ports-cd tree - see https://www.ports.debian.org/
-  auth users = *
-  read only = true
-  secrets file = /home/archvsync/rsyncd/debian-ports-cd.secrets
-  strict modes = false
diff --git a/modules/roles/files/ports_master/rsyncd.conf b/modules/roles/files/ports_master/rsyncd.conf
new file mode 100644
index 000000000..baa128d16
--- /dev/null
+++ b/modules/roles/files/ports_master/rsyncd.conf
@@ -0,0 +1,24 @@
+uid = nobody
+gid = nogroup
+max connections = 25
+syslog facility = daemon
+socket options = SO_KEEPALIVE
+timeout = 7200
+log file = /var/log/rsyncd/rsyncd-ports-master.log
+
+[debian-ports]
+  path = /srv/ports-master.debian.org/ftp/debian-ports
+  comment = debian-ports tree - see https://www.ports.debian.org/
+  auth users = *
+  read only = true
+  ignore nonreadable = true
+  secrets file = /home/archvsync/rsyncd/debian-ports.secrets
+  strict modes = false
+
+[debian-ports-cd]
+  path = /srv/ports-master.debian.org/ftp/debian-ports-cd
+  comment = debian-ports-cd tree - see https://www.ports.debian.org/
+  auth users = *
+  read only = true
+  secrets file = /home/archvsync/rsyncd/debian-ports-cd.secrets
+  strict modes = false
diff --git a/modules/roles/manifests/ports-master.pp b/modules/roles/manifests/ports-master.pp
deleted file mode 100644
index 9efae9547..000000000
--- a/modules/roles/manifests/ports-master.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-class roles::ports-master {
-	rsync::site { 'ports-master':
-		source        => 'puppet:///modules/roles/ports-master/rsyncd.conf',
-		max_clients   => 100,
-		sslname       => 'ports-master.debian.org',
-	}
-
-	ssl::service { 'ports-master.debian.org':
-		key => true,
-	}
-
-	include ferm::ftp_conntrack
-
-	vsftpd::site { 'ports-master':
-		banner         => 'ports-master.debian.org FTP server',
-		logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
-		writable       => true,
-		writable_other => true,
-		chown_user     => mini-dak-unpriv,
-		root           => '/srv/ports-master.debian.org/ftp.upload',
-	}
-
-	if $bind6 {
-		vsftpd::site { 'ports-master-v6':
-			banner         => 'ports-master.debian.org FTP server',
-			logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
-			writable       => true,
-			writable_other => true,
-			chown_user     => mini-dak-unpriv,
-			root           => '/srv/ports-master.debian.org/ftp.upload',
-		}
-	}
-}
diff --git a/modules/roles/manifests/ports_master.pp b/modules/roles/manifests/ports_master.pp
new file mode 100644
index 000000000..6bc184d48
--- /dev/null
+++ b/modules/roles/manifests/ports_master.pp
@@ -0,0 +1,33 @@
+class roles::ports_master {
+	rsync::site { 'ports-master':
+		source      => 'puppet:///modules/roles/ports_master/rsyncd.conf',
+		max_clients => 100,
+		sslname     => 'ports-master.debian.org',
+	}
+
+	ssl::service { 'ports-master.debian.org':
+		key => true,
+	}
+
+	include ferm::ftp_conntrack
+
+	vsftpd::site { 'ports-master':
+		banner         => 'ports-master.debian.org FTP server',
+		logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
+		writable       => true,
+		writable_other => true,
+		chown_user     => mini-dak-unpriv,
+		root           => '/srv/ports-master.debian.org/ftp.upload',
+	}
+
+	if $bind6 {
+		vsftpd::site { 'ports-master-v6':
+			banner         => 'ports-master.debian.org FTP server',
+			logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
+			writable       => true,
+			writable_other => true,
+			chown_user     => mini-dak-unpriv,
+			root           => '/srv/ports-master.debian.org/ftp.upload',
+		}
+	}
+}