Browse Source

rename DEBIAN-SEC to DEBIAN-SECURITY

debianarchive-update
parazyd 6 years ago
parent
commit
fbaade5e33
Signed by untrusted user: parazyd GPG Key ID: F0CB28FCF78637DE
  1. 2
      amprolla_merge.py
  2. 18
      contrib/nginx.conf
  3. 8
      lib/config.def.py

2
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:

18
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;
}
}

8
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',
},

Loading…
Cancel
Save