projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 753ce69)
Prepare maintenance page for cdimage.d.o and friends
authorJulien Cristau <jcristau@debian.org>
Wed, 15 Aug 2018 06:31:18 +0000 (08:31 +0200)
committerJulien Cristau <jcristau@debian.org>
Wed, 15 Aug 2018 06:32:01 +0000 (08:32 +0200)
modules/roles/files/static-htdocs/cdimage-maintenance.html [new file with mode: 0644] patch | blob
modules/roles/manifests/static_mirror.pp patch | blob | history
modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb patch | blob | history

diff --git a/modules/roles/files/static-htdocs/cdimage-maintenance.html b/modules/roles/files/static-htdocs/cdimage-maintenance.html
new file mode 100644 (file)
index 0000000..aa9bb91
--- /dev/null
+++ b/modules/roles/files/static-htdocs/cdimage-maintenance.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+       <HEAD>
+                  <TITLE>Service unavailable</TITLE>
+       </HEAD>
+       <BODY>
+
+               <H1>Service unavailable</H1>
+
+               The service you have requested is currently down for maintenance while our hosting partner performs some infrastructure work, see <a href="https://lists.debian.org/debian-infrastructure-announce/2018/08/msg00001.html">this message</a> for details.
+               <P>
+               <P>
+               <HR NOSHADE />
+               <FONT size="-1">DSA</FONT>
+
+       </BODY>
+</HTML>
+
diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 2dfc333..4bd30e3 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -235,4 +235,8 @@ class roles::static_mirror {
                ensure => absent,
        }
 
+       ssl::service { 'cdimage.debian.org': ensure => present, notify => Exec['service apache2 reload'], key => true, }
+       file { '/srv/static.debian.org/puppet/cdimage.debian.org/503.html':
+               source => 'puppet:///modules/roles/static-htdocs/cdimage-maintenance.html',
+       }
 }
diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 9438728..67c2c60 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -407,5 +407,48 @@ Use common-dsa-vhost-https-redirect archive.debian.net
        Use common-disabled-service
 </VirtualHost>
 
+<VirtualHost <%= @vhost_listen %> >
+       ServerName cdimage.debian.org
+       ServerAlias cloud.debian.org
+       ServerAlias get.debian.org
+       ServerAlias meetings-archive.debian.net
+       ServerAdmin debian-admin@debian.org
+       ErrorLog /var/log/apache2/cdimage.debian.org-error.log
+       CustomLog /var/log/apache2/cdimage.debian.org-access.log privacyssl
+
+       <IfModule mod_userdir.c>
+               UserDir disabled
+       </IfModule>
+       DocumentRoot /srv/static.debian.org/puppet/cdimage.debian.org
+       <Directory /srv/static.debian.org/puppet/cdimage.debian.org>
+               Require all granted
+       </Directory>
+       RewriteEngine On
+       RewriteRule !^/503.html / [R=503]
+       ErrorDocument 503 /503.html
+</VirtualHost>
+
+<VirtualHost <%= @vhost_listen_443 %> >
+       ServerName cdimage.debian.org
+       ServerAlias cloud.debian.org
+       ServerAlias get.debian.org
+       ServerAlias meetings-archive.debian.net
+       ServerAdmin debian-admin@debian.org
+       ErrorLog /var/log/apache2/cdimage.debian.org-error.log
+       CustomLog /var/log/apache2/cdimage.debian.org-access.log privacyssl
+       Use common-debian-service-ssl cdimage.debian.org
+
+       <IfModule mod_userdir.c>
+               UserDir disabled
+       </IfModule>
+       DocumentRoot /srv/static.debian.org/puppet/cdimage.debian.org
+       <Directory /srv/static.debian.org/puppet/cdimage.debian.org>
+               Require all granted
+       </Directory>
+       RewriteEngine On
+       RewriteRule !^/503.html / [R=503]
+       ErrorDocument 503 /503.html
+</VirtualHost>
+
 
 # vim:ft=apache:
Unnamed repository; edit this file 'description' to name the repository.