diff --git a/systems/palatine-hill/docker/torr.nix b/systems/palatine-hill/docker/torr.nix index 92a7efb..f999ca9 100644 --- a/systems/palatine-hill/docker/torr.nix +++ b/systems/palatine-hill/docker/torr.nix @@ -17,33 +17,40 @@ let qbit_path = "${torr_path}/qbit"; qbitvpn_path = "${torr_path}/qbitvpn"; qbitperm_path = "${torr_path}/qbitperm"; + data_path = "${torr_path}/data"; in { virtualisation.oci-containers.containers = { qbit = qbitBase // { + # webui port is 8082, torr port is 29432 environment = qbitBase.environment // { WEBUI_PORT = "8082"; + TORRENTING_PORT = "29432"; }; volumes = [ "${qbit_path}/config:/config" # move from docker/qbit to qbit_path - "${qbit_path}/data/:/data" + "${data_path}/data/:/data" "/etc/localtime:/etc/localtime:ro" ]; ports = [ - "8082:8112" + "8082:8082" "29432:29432" + "29432:29432/udp" ]; }; qbitVPN = qbitBase // { - # webui port is 8081, torr port is 29432 + # webui port is 8081, torr port is 39274 networks = [ "container:gluetun-qbit" ]; + environment = qbitBase.environment // { + WEBUI_PORT = "8081"; + }; dependsOn = [ "gluetun-qbit" ]; volumes = [ "${qbitvpn_path}/config:/config" - "${qbit_path}/data:/data" + "${data_path}/data:/data" "/etc/localtime:/etc/localtime:ro" ]; }; @@ -52,17 +59,20 @@ in networks = [ "container:gluetun-qbit" ]; + environment = qbitBase.environment // { + WEBUI_PORT = "8083"; + }; dependsOn = [ "gluetun-qbit" ]; volumes = [ "${qbitperm_path}/config:/config" - "${qbit_path}/data:/data" + "${data_path}/data:/data" "/etc/localtime:/etc/localtime:ro" ]; }; gluetun-qbit = { image = "qmcgaw/gluetun:v3"; capabilities = { - NET_ADD = true; + NET_ADMIN = true; }; devices = [ "/dev/net/tun:/dev/net/tun" @@ -70,7 +80,7 @@ in ports = [ # qbitvpn "8081:8081" - "29432:29432" + "39274:39274" # qbitperm "8083:8083" diff --git a/systems/palatine-hill/secrets.yaml b/systems/palatine-hill/secrets.yaml index 0f39471..fc9e85b 100644 --- a/systems/palatine-hill/secrets.yaml +++ b/systems/palatine-hill/secrets.yaml @@ -32,7 +32,7 @@ docker: sonarr: ENC[AES256_GCM,data:X/hM31ZyHybvy2eQzVnmq8CH1AqBgz1pxq7tKC4lZB3ryAbnEIJksffem8+35tWt/0r5cEH4aaIKD1kS7Q+Ma+8JrRLcWkt6CZq/wspz,iv:44FfdVpQCposXshzNe5DXAxExeQzjVKhkZaVbgKo8KU=,tag:WIWWUt1XBngUTwwqhCrcNw==,type:str] lidarr: ENC[AES256_GCM,data:xERBECneutNUMZRrHukp8CaNrpI7SXUB16zUkauNP2+wto3eIc/K+2nMCkbwSC9AKlSjnUGSiORmAWn/jofTAuEzQljkCR1XCSkJRMmL,iv:iKf4fZtCfdjT/KuMFK5VFoLAV+Lll8uJowe9Q4cHyYw=,tag:xzmATTkrYRYm9Mw23zEO5g==,type:str] jellyseerr: ENC[AES256_GCM,data:7dDfHFp8+WbJqrf7Ms/gmfroBePwegXh5CXn5FcOz8IEK7rTvr9KZfz9x/1BwdD8,iv:ZPi3OcMfH76A08piKY4P7hFbeMyouwBoeN5oL3ExzKU=,tag:oOZ37dy/y+DFqNRfAHexvQ==,type:str] - gluetun: ENC[AES256_GCM,data:3wOijlcj2WePhWVtRS5rUILI969GWLCuOrbiQ2MlVui0wy3Upzw2jdtTaly5UdTvy55a1ryxJ49nmuPxm2hJclGjw1P2o0yAf6CJRiJQwWJaAZbbDtlfTCus1sHTs/e2556DSa74YQg1D0VdQLGidzma8Efn/QaP6v9shEUue8CxU/aRbi48TPrhzl7k9xU9IHqCgZoo3utZ1xtn2AVfkZJDo9rPuZsQrEy95wvoVtyHK8OvLIXXZuUjANdJKmI9Wn73t4a9PR4K7Bydr5DtrYGhtw9b/L7QX6Okjin+kuDfL/iP3vPxMusTAULvpGexgDWVirL/h0o73Us7Noce8jZ6yKAFsH2jJ/IDIUYPdxPH/gts8FX3PFsz/dxQincN5s+itFlCJ72LIXk/hC6kyMzF+WRza0F7FR2CrQGscuCJ2Cd1fqVAi5ZXg/07+H//Dy8SPR62HUuTDlEcNNXZcwRm2+AaZwXF7UhOv+lR4fAqF8w+I0rjioVLJQltx7td+5r/Gq+sQBp+n0WPZUbmy0jHF8YwKMjSCckqtjah+/+l4CBsFI0xVs654snfmg==,iv:fanygdgYvSdJeCHpEXUfS7sPkXIj5pDxVtfYWo/c5Jc=,tag:oWx+UaIsDjDehsPlBM9f6g==,type:str] + gluetun: ENC[AES256_GCM,data:LSIHzw4HXoegkPwpEzLGFZfrAJG37Qcb+1aPVkbqElMyezxgEXUMzA3IOjkI/2aREmfjnm2gQxuidtvL+50jT7bBP6I/8+BTifVfdgk1nqtLasyGRcjDi2BGvITFGoXoHMY+3cNp1bhrDp0VjOtkwR4S2EsTajvUjvuj+TKcPkBlBIjNhO0UXbBZhfh0cERCEa5BxKz/wOKgyu8Gqgts+QPFhVpV/xT8LzI1Wx3+fG6UxUFqeY3XKsPf8Ku9Ghw+D9ZEbMOxbXsRg0ljtwHJ+o8SJ1mQCSkkbCHKskFwM7mH3xqBQT7HlnI3xKHpimCTB1FUQLxJoJ9eUWEfJKnFv363OgnUdB682vofFe1H/hzKP9/EbdGxe1JYqf+9VlYcoYXnFxJhBwvd3zjRJpDZRoiIndSTopi46A+nsw18jRtj6VQaNvbqe76bZWN7+cCzfNHy57qZSF0bUKqLj1HoBSDbPrxFAkuOdelHmMBx6Aer8MEepR1YDOS1rW9Uw60vYgyQDGdHz1pU4JUkD4Ny5gc2nOnAoHjzqCHX0rLqCiF/qOEfDI3cb0g48ccH5n8TyjO4mtoj0Q==,iv:0IQfKX0KcdCloo8KEyQOpoZ4NdwX6am46b0QPHOXguA=,tag:9hCV1TDycq0XUcc2Xd1//Q==,type:str] acme: bunny: ENC[AES256_GCM,data:P2yROVUga9mORcq8VR/l0i4/2Vod1zvlYq+ZJLLNKow0SpblkwQX/i1ucQYAOkTTRddN+3C+t0zj1rMWkdLoaLjEUJJi3VsSxi+chV2FFiVKFQGEcg24,iv:aQvGgGLsgRGoEmwTgZHR8Jm/MYxmGtVTT/fZKaTLeMs=,tag:m3ssF4O8qs4yxvMu6yUcjw==,type:str] dnsimple: ENC[AES256_GCM,data:37FKyBibFtXZgI4EduJQ0z8F+shBc5Q6YlLa3YkVPh9XuJVS20eybi75bfJxiozcZ9d+YRaqcbkBQCSdFOCotDU=,iv:oq3JjqbfAm2C4jcL1lvUb2EOmnwlR07vPoO8H0BmydQ=,tag:E3NO/jMElL6Q817666gIyg==,type:str] @@ -51,8 +51,8 @@ sops: cXNZWmZqd0R0SmhINExscHBKWmxvblUKEFEQvt/zQFARba4S8vHz/1SoKdKg69At LZ58XQGOmlGbBhPr7EzYQ2XSY4flWbnnD174cmCR8DNFm15DsNA5fw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-01-08T03:15:14Z" - mac: ENC[AES256_GCM,data:THKtji76rAaUHSs9l9u/VELujQVlNmuDeS8ICi2bjmYIuxT1BgdkeAKDy10wXEGPf0BIzuVmFyJs8y9+pm8idMcvGRVBvDv+XkBn0uVV01dRHJ/AfQgutMEWiXkNVSF48GfOsT/khXM13IwCjO8bwS77jcbL+NVPs0KVCxHI7us=,iv:xAubTMuGlllwxHgrzzX/2hkYq/j/aC8PoNo6jHZbSDU=,tag:7XJVhsfKUeJrJmK6egN7nw==,type:str] + lastmodified: "2026-01-08T04:11:30Z" + mac: ENC[AES256_GCM,data:dSrAVkL44NOXqgFog7XjD+zSane7YeqKM/SnAPaDNEYJVUcS3V1RYdL8Br1Vjrgac9ZVMU2W04jXCuZPg13uFsyYgczC0l1s39FodKnRc7Xt8eoHSejsETBeaaC8aLH7xVhWGk+fR4w7o4Vw+gtOzKPyvobuevBZfg7ugfObn10=,iv:vfHm3jjKXdi8V+2x8br5DqVgDgchJ9yewgP0vfeOP9M=,tag:z4bkPbK6weHaPyYbGJxaOw==,type:str] pgp: - created_at: "2024-11-28T18:56:39Z" enc: |-