Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ma vpn: add vpnws client and server

Browse Source
This commit is contained in:
makefu 2017-12-18 21:27:26 +01:00
parent 4d4d11a765
commit e2369d551e
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
makefu/2configs/vpn/vpnws/client.nix Normal file
View File

@ -0,0 +1,9 @@
{ pkgs, ... }:
{
users.users.makefu.packages = with pkgs; [ iproute vpn-ws ];
# vpn-ws-client vpnws wss://localhost/vpn --no-verify --exec "ip link set vpnws up;ip addr add 10.244.1.2/24 dev vpnws"
networking.interfaces.vpnws = {
virtual = true;
virtualType = "tap";
};
}

17
makefu/2configs/nginx/euer.blog.vpn.nix → makefu/2configs/vpn/vpnws/server.nix
View File

@ -4,11 +4,20 @@ let
uid = "nginx";
gid = "nginx";
ip = "${pkgs.iproute}/bin/ip";
socket = "/run/vpn.sock";
htpasswd = (toString <secrets>) + "/vpn-ws-auth";
nginx-prepared-secrets = "/var/spool/nginx/vpn-ws-auth";
in {
systemd.services.vpn-ws-auth-prepare = {
wantedBy = [ "multi-user.target" ];
before = [ "nginx.service" ];
script = "install -m700 -o${uid} -g${gid} ${htpasswd} ${nginx-prepared-secrets}";
};
services.nginx.virtualHosts."euer.krebsco.de".locations."/vpn" = {
# TODO client auth
extraConfig = ''
uwsgi_pass unix:/run/vpn.sock;
auth_basic "please stand by...";
auth_basic_user_file ${nginx-prepared-secrets};
uwsgi_pass unix:${socket};
include ${pkgs.nginx}/conf/uwsgi_params;
'';
};
@ -27,9 +36,7 @@ in {
${ip} link set vpnws up
${ip} addr add 10.244.1.1/24 dev vpnws || :
'';
ExecStart = pkgs.writeDash "vpnws-start" ''
${pkg}/bin/vpn-ws --tuntap vpnws /run/vpn.sock
'';
ExecStart = "${pkg}/bin/vpn-ws --uid ${uid} --gid ${gid} --tuntap vpnws ${socket}";
};
};
}