[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: share the same apache settings between debian and debian_live_build artifacts

[Mattia Rizzolo (@mattia)]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
93a6d1ac by Mattia Rizzolo at 2021-07-29T10:09:33+02:00
reproducible: share the same apache settings between debian and debian_live_build artifacts

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


1 changed file:

- hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf


Changes:

=====================================
hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
=====================================
@@ -1,3 +1,5 @@
+# vim: set noexpandtab:
+
 <Macro https-redirect $name>
 	<VirtualHost *:80>
 		ServerName $name
@@ -101,6 +103,17 @@
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
 </Macro>
 
+<Macro r-b-artifacts $base>
+	<Directory /var/lib/jenkins/userContent/reproducible/$base/artifacts>
+		HeaderName .HEADER.html
+		<Limit GET POST HEAD>
+		  Order Allow,Deny
+		  Allow from all
+		  Deny from env=bad_bot
+		</Limit>
+	</Directory>
+</Macro>
+
 Use https-redirect jenkins.debian.net
 Use https-redirect reproducible.debian.net
 Use https-redirect reproducible-builds.org
@@ -198,14 +211,8 @@ Use https-redirect www.diffoscope.org
 
 	Include reproduciblemap.conf
 
-	<Directory /var/lib/jenkins/userContent/reproducible/debian/artifacts>
-		HeaderName .HEADER.html
-		<Limit GET POST HEAD>
-		  Order Allow,Deny
-		  Allow from all
-		  Deny from env=bad_bot
-		</Limit>
-	</Directory>
+	Use r-b-artifacts debian
+	Use r-b-artifacts debian_live_build
 
 	# for watching service logfiles
 	ScriptAlias /cgi-bin /srv/jenkins/bin/cgi-bin



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/93a6d1ac4162df31d7deb1b50f873abdf28b6584

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/93a6d1ac4162df31d7deb1b50f873abdf28b6584
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20210729/4abd3256/attachment-0001.htm>