From: Julien Cristau <jcristau@debian.org>
Date: Tue, 29 Aug 2017 21:35:41 +0000 (+0200)
Subject: Add /srv/security.upload.d.o on suchon
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=fd8ca6e26ac1706c5eccde4789362206daa0ff4a;p=mirror%2Fdsa-puppet.git

Add /srv/security.upload.d.o on suchon
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 50b208ed5..8cec86bf8 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -130,6 +130,8 @@ roles:
     - mirror-bytemark.debian.org
   security_tracker:
     - soriano.debian.org
+  security_upload:
+    - suchon.debian.org
   ssh.upload.d.o:
     - coccia.debian.org
     - suchon.debian.org
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ab1f69693..246480716 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -84,6 +84,9 @@ class roles {
 	if has_role('ssh.upload.d.o') {
 		include roles::ssh_upload
 	}
+	if has_role('security_upload') {
+		include roles::security_upload
+	}
 	if has_role('api.ftp-master') {
 		ssl::service { 'api.ftp-master.debian.org':
 			notify  => Exec['service apache2 reload'],
diff --git a/modules/roles/manifests/security_upload.pp b/modules/roles/manifests/security_upload.pp
new file mode 100644
index 000000000..bdab84f9b
--- /dev/null
+++ b/modules/roles/manifests/security_upload.pp
@@ -0,0 +1,8 @@
+class roles::security_upload {
+	file { '/srv/security.upload.debian.org':
+		ensure	=> directory,
+		mode	=> '2755',
+		owner	=> dak,
+		group	=> debadmin,
+	}
+}