Unverified Commit 53787787 authored by Paul Wise's avatar Paul Wise
Browse files

Update the setup for archive.debian.net 

Factor out the config into an apache2 macro.

Make the 503 error message more generic so it can be used anywhere.
parent 1837b82d

modules/apache2/files/disabled-service

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<IfModule mod_macro.c>

  <Macro common-disabled-service>

    <IfModule mod_userdir.c>

      UserDir disabled

    </IfModule>

    DocumentRoot /srv/static.debian.org/puppet/disabled-service

    <Directory /srv/static.debian.org/puppet/disabled-service>

      AllowOverride FileInfo Indexes Options=Multiviews

      Options Indexes SymLinksIfOwnerMatch

      Require all granted

    </Directory>

    RedirectMatch 503 ^/(?!503\.html)

    ErrorDocument 503 /503.html

    <IfModule mod_headers.c>

      Header always set Retry-After "18000"

    </IfModule>

  </Macro>

</IfModule>

modules/apache2/manifests/init.pp

+4 −0
Original line number Diff line number Diff line
@@ -97,6 +97,10 @@ class apache2 { 
		source => 'puppet:///modules/apache2/headers',

	}



	apache2::config { 'disabled-service':

		source => 'puppet:///modules/apache2/disabled-service',

	}



	apache2::module { 'mpm_event': ensure => absent }

	if has_role('apache_prefork') {

		apache2::module { 'mpm_worker': ensure => absent }

modules/roles/files/static-htdocs/archive.debian.net/503.html→modules/roles/files/static-htdocs/disabled-service/503.html

+2 −2
Original line number Diff line number Diff line 
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">

<HTML>

<HEAD>

   <TITLE>Welcome to archive.debian.net!</TITLE>

   <TITLE>Service disabled!</TITLE>

</HEAD>

<BODY>



<H1>Welcome to archive.debian.net!</H1>

<H1>Service disabled!</H1>



Unfortunately, this service is not available at this time.  It is not

known when its maintainer will be able to provide it again.

modules/roles/manifests/static_mirror.pp

+10 −3
Original line number Diff line number Diff line
@@ -193,17 +193,24 @@ class roles::static_mirror { 
		onion::service { 'planet.debian.org'             : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }

	}



	ssl::service { 'archive.debian.net': ensure => present, notify  => Exec['service apache2 reload'], key => true, }

	file { '/srv/static.debian.org/puppet':

		ensure => directory,

		mode   => '02755'

	}

	file { '/srv/static.debian.org/puppet/archive.debian.net':

	file { '/srv/static.debian.org/puppet/disabled-service':

		ensure => directory,

		mode   => '02755'

	}

	file { '/srv/static.debian.org/puppet/disabled-service/503.html':

		source => 'puppet:///modules/roles/static-htdocs/disabled-service/503.html',

	}



	ssl::service { 'archive.debian.net': ensure => present, notify  => Exec['service apache2 reload'], key => true, }

	file { '/srv/static.debian.org/puppet/archive.debian.net':

		ensure => absent,

	}

	file { '/srv/static.debian.org/puppet/archive.debian.net/503.html':

		source => 'puppet:///modules/roles/static-htdocs/archive.debian.net/503.html',

		ensure => absent,

	}



}

modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb

+1 −17
Original line number Diff line number Diff line
@@ -337,25 +337,9 @@ Use common-dsa-vhost-https-redirect archive.debian.net 
	ServerAdmin debian-admin@debian.org

	ErrorLog /var/log/apache2/archive.debian.net-error.log

	CustomLog /var/log/apache2/archive.debian.net-access.log privacyssl



	Use common-debian-service-ssl archive.debian.net

	Use common-ssl-HSTS



	<IfModule mod_userdir.c>

		UserDir disabled

	</IfModule>

	ServerSignature On



	DocumentRoot /srv/static.debian.org/puppet/archive.debian.net

	<Directory /srv/static.debian.org/puppet/archive.debian.net>

		AllowOverride FileInfo Indexes Options=Multiviews

		Options Indexes SymLinksIfOwnerMatch

		Require all granted

	</Directory>



	RedirectMatch 503 ^/(?!503\.html)

	ErrorDocument 503 /503.html

	Header always set Retry-After "18000"

	Use common-disabled-service

</VirtualHost>