X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fdebtags%2Fdebtags.debian.org;h=eb8fcf35c2cec5d0e2b36708dc0ffe79d72af7dc;hb=f109896bf9fdedba3e650a838c6f78f545082abf;hp=831c61fec7ad36b9a03fff4cadef3b28ead208d5;hpb=45fef3f4d8226ac14e463442ddaf08c275002564;p=mirror%2Fdsa-puppet.git
diff --git a/modules/roles/files/debtags/debtags.debian.org b/modules/roles/files/debtags/debtags.debian.org
index 831c61fec..eb8fcf35c 100644
--- a/modules/roles/files/debtags/debtags.debian.org
+++ b/modules/roles/files/debtags/debtags.debian.org
@@ -1,42 +1,56 @@
Use common-debian-service-https-redirect * debtags.debian.org
+
+ ServerName debtags.debian.net
+ ServerAdmin debian-admin@lists.debian.org
+
+ CustomLog /var/log/apache2/debtags.debian.org-access.log privacy
+ ErrorLog /var/log/apache2/debtags.debian.org-error.log
+
+ Redirect permanent / https://debtags.debian.org/
+
+
WSGIDaemonProcess debtags.debian.org user=nobody group=debtags home=/ processes=2 threads=5 maximum-requests=5000 inactivity-timeout=1800 umask=0077 display-name=wsgi-debtags.debian.org
- ServerName debtags.debian.org
- ServerAdmin debian-admin@lists.debian.org
+ ServerName debtags.debian.org
+ ServerAdmin debian-admin@lists.debian.org
+
+ Use common-debian-service-ssl debtags.debian.org
+ Use common-ssl-HSTS
+ Use http-pkp-debtags.debian.org
- Use common-debian-service-ssl debtags.debian.org
- Use common-ssl-HSTS
+ SSLCACertificateFile /var/lib/dsa/sso/ca.crt
+ SSLCARevocationCheck chain
+ SSLCARevocationFile /var/lib/dsa/sso/ca.crl
+ SSLVerifyClient optional
- SSLCACertificateFile /var/lib/dsa/sso/ca.crt
- SSLCARevocationCheck chain
- SSLCARevocationFile /var/lib/dsa/sso/ca.crl
- SSLVerifyClient optional
+ SSLOptions +StdEnvVars
- SSLOptions +StdEnvVars
+
+ UserDir disabled
+
+ ErrorLog /var/log/apache2/debtags.debian.org-error.log
+ CustomLog /var/log/apache2/debtags.debian.org-access.log privacy
+ ServerSignature On
-
- UserDir disabled
-
- ErrorLog /var/log/apache2/debtags.debian.org-error.log
- CustomLog /var/log/apache2/debtags.debian.org-access.log privacy
- ServerSignature On
+
+ Require all granted
+
+ Alias /static/ /srv/debtags.debian.org/htdocs/
-
- Require all granted
-
- Alias /static/ /srv/debtags.debian.org/htdocs/
+
+
+ Require all granted
+
+
-
-
- Require all granted
-
-
+ WSGIScriptAlias / /srv/debtags.debian.org/debtagsd/debtagsd/wsgi.py
+ WSGIProcessGroup debtags.debian.org
+ WSGIPassAuthorization On
- WSGIScriptAlias / /srv/debtags.debian.org/debtagsd/debtagsd/wsgi.py
- WSGIProcessGroup debtags.debian.org
- WSGIPassAuthorization On
+ Header always set Referrer-Policy "same-origin"
+# vim: syntax=apache ts=4 sw=4 sts=4 sr et