amprolla

commit 42cd4ef1482c66c082943a38a7883c6509bec607
parent 08515912f203b19cb94ea10775bd7dbeb35da869
Author: parazyd <parazyd@dyne.org>
Date:   Mon, 26 Jun 2017 14:26:57 +0200

nginx: use deb.debian.org for -security; shorten; tls example

Diffstat:
M
contrib/nginx.conf
 | 
24
+++++++-----------------

1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/contrib/nginx.conf b/contrib/nginx.conf
@@ -5,38 +5,32 @@ server {
 
 	server_name auto.mirror.devuan.org;
 
-	location / {
-		autoindex off;
-	}
-
 	location /merged {
 		autoindex on;
 		alias /srv/amprolla/merged;
 
 		rewrite /merged/pool/DEVUAN/(.*)     http://auto.mirror.devuan.org/devuan/pool/$1;
-		rewrite /merged/pool/DEBIAN-SEC/(.*) http://security.debian.org/pool/$1;
+		rewrite /merged/pool/DEBIAN-SEC/(.*) http://deb.debian.org/debian-security/pool/$1;
 		rewrite /merged/pool/DEBIAN/(.*)     http://deb.debian.org/debian/pool/$1;
 	}
 }
 
 # https://auto.mirror.devuan.org
 server {
-	listen 443;
-	listen [::]:443;
+	listen 443 ssl;
+	listen [::]:443 ssl;
 
 	server_name auto.mirror.devuan.org;
 
-	location / {
-		autoindex off;
-	}
+	ssl_certificate     /etc/ssl/snake_oil.crt
+	ssl_certificate_key /etc/ssl/snake_oil.key
 
 	location /merged {
 		autoindex on;
 		alias /srv/amprolla/merged;
 
 		rewrite /merged/pool/DEVUAN/(.*)     https://auto.mirror.devuan.org/devuan/pool/$1;
-		# security.debian.org doesn't provide https
-		rewrite /merged/pool/DEBIAN-SEC/(.*) http://security.debian.org/pool/$1;
+		rewrite /merged/pool/DEBIAN-SEC/(.*) https://deb.debian.org/debian-security/pool/$1;
 		rewrite /merged/pool/DEBIAN/(.*)     https://deb.debian.org/debian/pool/$1;
 	}
 }
@@ -47,17 +41,13 @@ server {
 
 	server_name devuanfwojg73k6r.onion;
 
-	location / {
-		autoindex off;
-	}
-
 	location /merged {
 		autoindex on;
 		alias /srv/amprolla/merged;
 
 		# see: https://onion.debian.org
 		rewrite /merged/pool/DEVUAN/(.*)     http://devuanfwojg73k6r.onion/devuan/pool/$1;
-		rewrite /merged/pool/DEBIAN-SEC/(.*) http://sgvtcaew4bxjd7ln.onion/pool/$1;
+		rewrite /merged/pool/DEBIAN-SEC/(.*) http://vwakviie2ienjx6t.onion/debian-security/pool/$1;
 		rewrite /merged/pool/DEBIAN/(.*)     http://vwakviie2ienjx6t.onion/debian/pool/$1;
 	}
 }