From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 15 Aug 2015 11:30:23 +0000 (+0200)
Subject: Provide a default configuration file for buildds
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5715c43a537e3db4c51ee698056b70435b3127a8;p=mirror%2Fdsa-puppet.git

Provide a default configuration file for buildds

We can provide a /etc/buildd/buildd.conf file on buildds to reduce a
bit the amount of configuration to be done in $HOME/.builddrc. It
currently mostly includes upload configuration.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/buildd.conf b/buildd.conf
new file mode 100644
index 000000000..5b1c47015
--- /dev/null
+++ b/buildd.conf
@@ -0,0 +1,16 @@
+$nice_level = 0;
+$should_build_msgs = 0;
+$log_queued_messages = 1;
+
+$upload_queues = [
+        {
+                dupload_local_queue_dir => "upload",
+                dupload_archive_name => "rsync-ftp-master",
+        },
+        {
+                dupload_local_queue_dir => "upload-security",
+                dupload_archive_name => "security",
+        }
+];
+
+1;
diff --git a/modules/buildd/files/buildd.conf b/modules/buildd/files/buildd.conf
new file mode 100644
index 000000000..a4398bd31
--- /dev/null
+++ b/modules/buildd/files/buildd.conf
@@ -0,0 +1,14 @@
+$nice_level = 0;
+$should_build_msgs = 0;
+$log_queued_messages = 1;
+
+$upload_queues = [
+        {
+                dupload_local_queue_dir => "upload",
+                dupload_archive_name => "rsync-ftp-master",
+        },
+        {
+                dupload_local_queue_dir => "upload-security",
+                dupload_archive_name => "security",
+        }
+];
diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 5c6a30192..ee60baa7f 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -23,6 +23,13 @@ class buildd ($ensure=present) {
 			source  => 'puppet:///modules/buildd/dupload.conf',
 			require => Package['dupload'],
 		}
+		package { 'buildd':
+			ensure => installed,
+		}
+		file { '/etc/buildd/buildd.conf':
+			source  => 'puppet:///modules/buildd/buildd.conf',
+			require => Package['buildd'],
+		}
 		site::linux_module { 'dm_snapshot': }
 		include ferm::ftp_conntrack
 	}