amprolla

commit fbaade5e33a6ddddc54a1569dac8f209658185b1
parent d5f5598c1dd9a45861ce37b4718c9052d9272867
Author: parazyd <parazyd@dyne.org>
Date:   Wed, 28 Jun 2017 14:55:26 +0200

rename DEBIAN-SEC to DEBIAN-SECURITY

Diffstat:
M
amprolla_merge.py
 | 
2
+-
M
contrib/nginx.conf
 | 
18
+++++++++---------
M
lib/config.def.py
 | 
8
++++----

3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/amprolla_merge.py b/amprolla_merge.py
@@ -81,7 +81,7 @@ def merge(packages_list):
 
     debian_sec = load_packages_file(packages_list[1])
     if debian_sec:
-        all_repos.append({'name': 'debian-sec', 'packages': debian_sec})
+        all_repos.append({'name': 'debian-security', 'packages': debian_sec})
 
     debian = load_packages_file(packages_list[2])
     if debian:
diff --git a/contrib/nginx.conf b/contrib/nginx.conf
@@ -9,9 +9,9 @@ server {
 		autoindex on;
 		alias /srv/amprolla/merged;
 
-		rewrite /merged/pool/DEVUAN/(.*)     http://auto.mirror.devuan.org/devuan/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;
+		rewrite /merged/pool/DEVUAN/(.*)          http://auto.mirror.devuan.org/devuan/pool/$1;
+		rewrite /merged/pool/DEBIAN-SECURITY/(.*) http://deb.debian.org/debian-security/pool/$1;
+		rewrite /merged/pool/DEBIAN/(.*)          http://deb.debian.org/debian/pool/$1;
 	}
 }
 
@@ -29,9 +29,9 @@ server {
 		autoindex on;
 		alias /srv/amprolla/merged;
 
-		rewrite /merged/pool/DEVUAN/(.*)     https://auto.mirror.devuan.org/devuan/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;
+		rewrite /merged/pool/DEVUAN/(.*)          https://auto.mirror.devuan.org/devuan/pool/$1;
+		rewrite /merged/pool/DEBIAN-SECURITY/(.*) https://deb.debian.org/debian-security/pool/$1;
+		rewrite /merged/pool/DEBIAN/(.*)          https://deb.debian.org/debian/pool/$1;
 	}
 }
 
@@ -46,8 +46,8 @@ server {
 		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://vwakviie2ienjx6t.onion/debian-security/pool/$1;
-		rewrite /merged/pool/DEBIAN/(.*)     http://vwakviie2ienjx6t.onion/debian/pool/$1;
+		rewrite /merged/pool/DEVUAN/(.*)          http://devuanfwojg73k6r.onion/devuan/pool/$1;
+		rewrite /merged/pool/DEBIAN-SECURITY/(.*) http://vwakviie2ienjx6t.onion/debian-security/pool/$1;
+		rewrite /merged/pool/DEBIAN/(.*)          http://vwakviie2ienjx6t.onion/debian/pool/$1;
 	}
 }
diff --git a/lib/config.def.py b/lib/config.def.py
@@ -19,7 +19,7 @@ checksums = [
     {'name': 'SHA256', 'f': sha256},
 ]
 
-repo_order = ['devuan', 'debian-sec', 'debian']
+repo_order = ['devuan', 'debian-security', 'debian']
 
 repos = {
     'devuan': {
@@ -30,8 +30,8 @@ repos = {
         'aliases': False,
         'skipmissing': False,
     },
-    'debian-sec': {
-        'name': 'DEBIAN-SEC',
+    'debian-security': {
+        'name': 'DEBIAN-SECURITY',
         'host': 'http://security.debian.org',
         'dists': 'dists',
         'pool': 'pool',
@@ -69,7 +69,7 @@ suites = {
 }
 
 aliases = {
-    'DEBIAN-SEC': {
+    'DEBIAN-SECURITY': {
         'ascii-security': 'stretch/updates',
         'jessie-security': 'jessie/updates',
     },