From 0b9c56431623eeb69b6a70f32bddc0c083f797c9 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 26 Apr 2018 20:33:51 +0200
Subject: [PATCH] alioth-archive apache site

---
 modules/roles/manifests/alioth_archive.pp     | 15 ++++----
 .../apache-alioth-archive.debian.org.erb      | 36 +++++++++++++++++++
 2 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 modules/roles/templates/apache-alioth-archive.debian.org.erb

diff --git a/modules/roles/manifests/alioth_archive.pp b/modules/roles/manifests/alioth_archive.pp
index 549fe0200..b814b57c8 100644
--- a/modules/roles/manifests/alioth_archive.pp
+++ b/modules/roles/manifests/alioth_archive.pp
@@ -2,13 +2,14 @@ class roles::alioth_archive {
 	include apache2
 	include apache2::ssl
 
-	#apache2::site { 'XXX.debian.org':
-	#	content => template('roles/alioth_archive/XXX.debian.org.erb')
-	#}
-	#ssl::service { 'XXX.debian.org':
-	#	notify => Exec['service apache2 reload'],
-	#	key => true,
-	#}
+	apache2::site { '020-alioth-archive.debian.org':
+		site   => 'alioth-archive.debian.org',
+		content => template('roles/alioth_archive.debian.org.erb')
+	}
+	ssl::service { 'alioth-archive.debian.org':
+		notify => Exec['service apache2 reload'],
+		key => true,
+	}
 
 	file { '/srv/alioth-archive.debian.org':
 		ensure  => directory,
diff --git a/modules/roles/templates/apache-alioth-archive.debian.org.erb b/modules/roles/templates/apache-alioth-archive.debian.org.erb
new file mode 100644
index 000000000..6531cc783
--- /dev/null
+++ b/modules/roles/templates/apache-alioth-archive.debian.org.erb
@@ -0,0 +1,36 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+
+<Macro vhost-inner-alioth-archive.debian.org>
+	ServerAdmin debian-admin@lists.debian.org
+	DocumentRoot /srv/alioth-archive.debian.org/htdocs
+
+	ErrorLog /var/log/apache2/alioth-archive.debian.org-error.log
+	CustomLog /var/log/apache2/alioth-archive.debian.org-access.log privacy
+
+	<Directory /srv/alioth-archive.debian.org/htdocs>
+		Require all granted
+		AllowOverride none
+	</Directory>
+
+	RewriteEngine On
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
+</Macro>
+
+Use common-debian-service-https-redirect * alioth-archive.debian.org
+
+<VirtualHost *:443>
+	ServerName alioth-archive.debian.org
+	Use common-debian-service-ssl alioth-archive.debian.org
+	Use common-ssl-HSTS
+	Use http-pkp-alioth-archive.debian.org
+	Use vhost-inner-alioth-archive.debian.org
+</VirtualHost>
+
+# vim:set syn=apache:
-- 
2.20.1