tadd nginx conf - amprolla - devuan's apt repo merger
 (HTM) git clone git://parazyd.org/amprolla.git
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 10017e02ee4fb54800e5b12a55477ff37f738735
 (DIR) parent a9c75db0eb4ef83bb40b00e3685181bd6841102d
 (HTM) Author: parazyd <parazyd@dyne.org>
       Date:   Wed, 31 May 2017 13:44:10 +0200
       
       add nginx conf
       
       Diffstat:
         A contrib/amprolla.png                |       0 
         A contrib/nginx.conf                  |      16 ++++++++++++++++
         M lib/config.py                       |       4 ++--
       
       3 files changed, 18 insertions(+), 2 deletions(-)
       ---
 (DIR) diff --git a/contrib/amprolla.png b/contrib/amprolla.png
       Binary files differ.
 (DIR) diff --git a/contrib/nginx.conf b/contrib/nginx.conf
       t@@ -0,0 +1,16 @@
       +server {
       +        listen 80      auto.mirror.devuan.org;
       +        listen [::]:80 auto.mirror.devuan.org;
       +
       +        location / {
       +                autoindex on;
       +        }
       +
       +        location /merged {
       +                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/(.*)     http://deb.debian.org/debian/pool/$1;
       +        }
       +}
 (DIR) diff --git a/lib/config.py b/lib/config.py
       t@@ -21,7 +21,7 @@ repos = {
                'skipmissing': False,
            },
            'debian-sec': {
       -        'name': 'DEBIAN-SECURITY',
       +        'name': 'DEBIAN-SEC',
                'host': 'http://security.debian.org',
                'dists': 'dists',
                'pool': 'pool',
       t@@ -59,7 +59,7 @@ suites = {
        }
        
        aliases = {
       -    'DEBIAN-SECURITY': {
       +    'DEBIAN-SEC': {
                'ascii-security': 'stretch/updates',
                'jessie-security': 'jessie/updates',
            },