Use /vks/ as prefix for our API.

- Fixes #59.
This commit is contained in:
Justus Winter
2019-02-28 16:57:03 +01:00
parent 765ab569eb
commit 7cd3280bf6
4 changed files with 29 additions and 24 deletions

View File

@@ -1,22 +1,22 @@
# this routing file is included in the hagrid http block
# it is assumed that hagrid runs on localhost:8080
location /by-email/ {
rewrite "^/by-email/([^/]{2})([^/]*)$" /by-email/$1/$2 break;
location /vks/by-email/ {
rewrite "^/vks/by-email/([^/]{2})([^/]*)$" /by-email/$1/$2 break;
default_type application/pgp-keys;
add_header Content-Disposition 'attachment; filename="$1$2.asc"';
try_files /$uri =404;
}
location /by-fingerprint/ {
rewrite ^/by-fingerprint/(0x)?([^/][^/])(..*)$ /by-fingerprint/$2$3 break;
location /vks/by-fingerprint/ {
rewrite ^/vks/by-fingerprint/(0x)?([^/][^/])(..*)$ /vks/by-fingerprint/$2$3 break;
default_type application/pgp-keys;
add_header Content-Disposition 'attachment; filename="$2$3.asc"';
try_files /by-fpr/$2/$3 @fallback;
}
location /by-keyid/ {
rewrite ^/by-keyid/(0x)?([^/][^/])(.*)$ /by-keyid/$2$3 break;
location /vks/by-keyid/ {
rewrite ^/vks/by-keyid/(0x)?([^/][^/])(.*)$ /vks/by-keyid/$2$3 break;
default_type application/pgp-keys;
add_header Content-Disposition 'attachment; filename="$2$3.asc"';
try_files /by-keyid/$2/$3 @fallback;
@@ -33,14 +33,14 @@ location /pks/lookup {
if ($args ~ "^op=get&options=mr&?search=(0x)?([A-F0-9]{2})([A-F0-9]{14})$") {
set $dir $2;
set $file $3;
rewrite . /by-keyid/$dir/$file;
rewrite . /vks/by-keyid/$dir/$file;
}
# gpg --receive-keys <FINGERPRINT>
if ($args ~ "^op=get&options=mr&?search=(0x)?([A-F0-9]{2})([A-F0-9]{38})$") {
set $dir $2;
set $file $3;
rewrite . /by-fingerprint/$dir/$file;
rewrite . /vks/by-fingerprint/$dir/$file;
}
# gpg --locate-key <EMAIL>
@@ -48,7 +48,7 @@ location /pks/lookup {
set $dir $1;
set $local $2;
set $horst $4;
rewrite . /by-email/$dir/$local%40$horst;
rewrite . /vks/by-email/$dir/$local%40$horst;
}
proxy_pass http://127.0.0.1:8080;