From 6ee27b694bb4f0d3ac75d183a1b34d3f1f606377 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Wed, 28 Aug 2019 10:29:26 +0200
Subject: [PATCH] Remove debconf18 vhost from debussy

It moved to static.
---
 .../files/debconf_wafer/debconf18.debconf.org | 66 -------------------
 modules/roles/manifests/debconf_wafer.pp      |  3 +-
 2 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 modules/roles/files/debconf_wafer/debconf18.debconf.org

diff --git a/modules/roles/files/debconf_wafer/debconf18.debconf.org b/modules/roles/files/debconf_wafer/debconf18.debconf.org
deleted file mode 100644
index c21c7905e..000000000
--- a/modules/roles/files/debconf_wafer/debconf18.debconf.org
+++ /dev/null
@@ -1,66 +0,0 @@
-# do not modify - this file is maintained via puppet
-
-AddType application/font-woff2 .woff2
-
-Use common-debian-service-https-redirect * debconf18.debconf.org
-
-WSGIDaemonProcess debconf18 \
-  processes=3 threads=2 \
-  user=www-data group=debconf-web maximum-requests=750 umask=0007 display-name=wsgi-debconf18.debconf.org \
-  python-path=/srv/debconf-web/debconf18.debconf.org/dc18.dc.o/:/srv/debconf-web/debconf18.debconf.org/dc18.dc.o/ve/lib/python3.5/site-packages/
-
-<VirtualHost *:443>
-  ServerAdmin admin@debconf.org
-  ServerName debconf18.debconf.org
-
-  ErrorLog  /var/log/apache2/debconf18.debconf.org-error.log
-  CustomLog /var/log/apache2/debconf18.debconf.org-access.log combined
-
-  Use common-debian-service-ssl debconf18.debconf.org
-  Use common-ssl-HSTS
-
-  Header always set Referrer-Policy "same-origin"
-  Header always set X-Content-Type-Options nosniff
-  Header always set X-XSS-Protection "1; mode=block"
-#  Header always set Access-Control-Allow-Origin: "*"
-
-  # Debian SSO
-  SSLCACertificateFile /var/lib/dsa/sso/ca.crt
-  SSLCARevocationCheck chain
-  SSLCARevocationFile /var/lib/dsa/sso/ca.crl
-
-  WSGIProcessGroup debconf18
-  WSGIScriptAlias / /srv/debconf-web/debconf18.debconf.org/dc18.dc.o/wsgi.py
-  WSGIPassAuthorization On
-
-  <Directory /srv/debconf-web/debconf18.debconf.org/dc18.dc.o>
-    <Files wsgi.py>
-      Require all granted
-    </Files>
-  </Directory>
-
-  Alias /static/ /srv/debconf-web/debconf18.debconf.org/dc18.dc.o/localstatic/
-  Alias /favicon.ico /srv/debconf-web/debconf18.debconf.org/dc18.dc.o/localstatic/img/favicon/favicon.ico
-  <Directory /srv/debconf-web/debconf18.debconf.org/dc18.dc.o/localstatic/>
-    Require all granted
-
-    # A little hacky, but it means we won't accidentally catch non-hashed filenames
-    <FilesMatch ".*\.[0-9a-f]{12}\.[a-z0-9]{2,5}$">
-      ExpiresActive on
-      ExpiresDefault "access plus 1 year"
-    </FilesMatch>
-  </Directory>
-
-  Alias /media/ /srv/debconf-web/debconf18.debconf.org/dc18.dc.o/media/
-  <Directory /srv/debconf-web/debconf18.debconf.org/dc18.dc.o/media/>
-    Require all granted
-  </Directory>
-
-  <Location /accounts/debian-login>
-    SSLOptions +StdEnvVars
-    # Allow access if one does not have a valid certificate
-    SSLVerifyClient optional
-  </Location>
-</VirtualHost>
-
-# vim: set ft=apache:
diff --git a/modules/roles/manifests/debconf_wafer.pp b/modules/roles/manifests/debconf_wafer.pp
index 95c369adb..d64d06a53 100644
--- a/modules/roles/manifests/debconf_wafer.pp
+++ b/modules/roles/manifests/debconf_wafer.pp
@@ -17,10 +17,11 @@ class roles::debconf_wafer {
 	ssl::service { 'debconf18.debconf.org':
 		notify  => Exec['service apache2 reload'],
 		key => true,
+		ensure => absent,
 	}
 	apache2::site { '010-debconf18.debconf.org':
 		site    => 'debconf18.debconf.org',
-		source => 'puppet:///modules/roles/debconf_wafer/debconf18.debconf.org',
+		ensure  => absent,
 	}
 
 	ssl::service { 'debconf19.debconf.org':
-- 
2.20.1