From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 31 Jan 2017 20:32:38 +0000 (+0100)
Subject: add cdimage-search role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=66b3b20c5d78a81cb87ae9d4c22717887cc05c8c;p=mirror%2Fdsa-puppet.git

add cdimage-search role
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 4eaf9873f..241cb2317 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -269,3 +269,5 @@ roles:
     - wieck.debian.org
   bgp:
     - bilbao.debian.org
+  cdimage-search:
+    - cgi-grnet-01.debian.org
diff --git a/modules/roles/manifests/cdimage_search.pp b/modules/roles/manifests/cdimage_search.pp
new file mode 100644
index 000000000..211d50984
--- /dev/null
+++ b/modules/roles/manifests/cdimage_search.pp
@@ -0,0 +1,8 @@
+class roles::cdimage_search {
+	package { 'debian.org-cdimage-search.debian.org': ensure => installed, }
+
+	apache2::site { '010-cdimage-search.debian.org':
+		site   => 'cdimage-search.debian.org',
+		content => template('roles/apache-cdimage-search.debian.org.conf.erb')
+	}
+}
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 978be8111..15b79f05d 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -319,4 +319,7 @@ class roles {
 	if has_role('bgp') {
 		include roles::bgp
 	}
+	if has_role('cdimage-search') {
+		include roles::cdimage_search
+	}
 }
diff --git a/modules/roles/templates/apache-cdimage-search.debian.org.conf.erb b/modules/roles/templates/apache-cdimage-search.debian.org.conf.erb
new file mode 100644
index 000000000..f6ce99173
--- /dev/null
+++ b/modules/roles/templates/apache-cdimage-search.debian.org.conf.erb
@@ -0,0 +1,24 @@
+<VirtualHost *:80>
+	ServerAdmin debian-cd@lists.debian.org
+	DocumentRoot /srv/cdimage-search.debian.org/htdocs
+	ServerName cdimage-search.debian.org
+	ErrorLog /var/log/apache2/cdimage-search.debian.org-error.log
+	CustomLog /var/log/apache2/cdimage-search.debian.org-access.log combined
+
+	ScriptAlias /cgi-bin/ /srv/cdimage-search.debian.org/cgi-bin/
+	<Directory "/srv/cdimage-search.debian.org/cgi-bin">
+		AllowOverride None
+		Options +ExecCGI -MultiViews +SymlinksIfOwnerMatch
+		Require all granted
+	</Directory>
+
+	<Directory /srv/cdimage-search.debian.org/htdocs>
+		Require all granted
+		AllowOverride none
+	</Directory>
+
+	RewriteEngine On
+	RewriteRule ^/$ /cgi-bin/find_file.cgi [PT]
+</VirtualHost>
+
+# vim:set syn=apache: