diff --git a/keys/scribe b/keys/scribe new file mode 100644 index 0000000..6637eca Binary files /dev/null and b/keys/scribe differ diff --git a/keys/secrets.nix b/keys/secrets.nix index deabb14..8939072 100644 --- a/keys/secrets.nix +++ b/keys/secrets.nix @@ -15,5 +15,6 @@ in "wg-ren.priv".publicKeys = macbook++master++ren; "ren.priv".publicKeys = master ++ ren; "wg-scribe".publicKeys = master ++ ren ++ macbook; + "scribe".publicKeys = master ++ ren ++ macbook; "smbshare".publicKeys = master ++ macbook ++ ren ++ selene; } \ No newline at end of file diff --git a/modules/servermodules/arr/arr.nix b/modules/servermodules/arr/arr.nix index 0921cdd..9e0316c 100644 --- a/modules/servermodules/arr/arr.nix +++ b/modules/servermodules/arr/arr.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, config, ... }: let mediaGroup = "media"; in @@ -15,12 +15,18 @@ in ]; }; - age.secrets.wg-scribe = { - file = ../../../keys/wg-scribe; - path = "/etc/wireguard/wg-scribe.conf"; + age.secrets.vpn = { + file = ../../../keys/scribe; + owner = "ren"; }; - networking.firewall.trustedInterfaces = [ "wg-selene" "wg-scribe" ]; + services.openvpn.servers = { + officeVPN = { + config = ''config ${config.age.secrets.vpn.path} ''; + }; + }; + + networking.firewall.trustedInterfaces = [ "wg-selene" ]; networking.firewall.allowedUDPPorts = [ 23379 ]; networking.firewall.allowedTCPPorts = [ 23379 ]; @@ -28,10 +34,10 @@ in services.prowlarr.enable = true; services.deluge = { - enable = true; - web.enable = true; - user = "torrenter"; - group = mediaGroup; + enable = true; + web.enable = true; + user = "torrenter"; + group = mediaGroup; };