diff --git a/templates/nftables.j2 b/templates/nftables.j2 index 55eaa7a..4485ed9 100644 --- a/templates/nftables.j2 +++ b/templates/nftables.j2 @@ -21,11 +21,12 @@ table ip filter { iifname "br0" tcp dport {{ ssh_port }} accept comment "SSH" iifname "br0" tcp dport { {{ http_port }}, {{ https_port }} } accept comment "HTTP/HTTPS" + iifname "br0" tcp dport {{ transmission_port }} accept comment "Transmission" iifname "br0" udp dport {{ vpn_port }} accept comment "Wireguard" iifname "{{ vpn_interface }}" tcp dport { {{ http_port }}, {{ https_port }} } ip saddr {{ vpn_source_range }} ip daddr {{ vpn_destination_range }} accept comment "HTTP/HTTPS" - iifname "{{ vpn_interface }}" tcp dport {{ transmission_port }} ip saddr {{ vpn_source_range }} ip daddr {{ vpn_destination_range }} accept comment "Transmission" + iifname "{{ vpn_interface }}" tcp dport {{ transmission_web_port }} ip saddr {{ vpn_source_range }} ip daddr {{ vpn_destination_range }} accept comment "Transmission Web" iifname "{{ vpn_interface }}" tcp dport { {{ syncthing_gui_port }}, {{ syncthing_protocol_port }} } ip saddr {{ vpn_source_range }} ip daddr {{ vpn_destination_range }} accept comment "Syncthing" iifname "{{ vpn_interface }}" tcp dport {{ mpd_port }} ip saddr {{ vpn_source_range }} ip daddr {{ vpn_destination_range }} accept comment "MPD" } diff --git a/templates/nginx/vpn.j2 b/templates/nginx/vpn.j2 index 802b260..0937cee 100644 --- a/templates/nginx/vpn.j2 +++ b/templates/nginx/vpn.j2 @@ -27,6 +27,6 @@ server { } location /transmission/ { - proxy_pass http://127.0.0.1:{{ transmission_port }}/transmission/; + proxy_pass http://127.0.0.1:{{ transmission_web_port }}/transmission/; } } diff --git a/templates/transmission.j2 b/templates/transmission.j2 index f66e85e..29bd20f 100644 --- a/templates/transmission.j2 +++ b/templates/transmission.j2 @@ -6,7 +6,7 @@ "alt-speed-time-enabled": false, "alt-speed-time-end": 1020, "alt-speed-up": 50, - "bind-address-ipv4": "127.0.0.1", + "bind-address-ipv4": "{{ lan_ip_address }}", "bind-address-ipv6": "::", "blocklist-enabled": false, "blocklist-url": "http://www.example.com/blocklist", @@ -29,10 +29,10 @@ "peer-id-ttl-hours": 6, "peer-limit-global": 200, "peer-limit-per-torrent": 50, - "peer-port": 62215, + "peer-port": {{ transmission_port }}, "peer-port-random-high": 65535, "peer-port-random-low": 49152, - "peer-port-random-on-start": true, + "peer-port-random-on-start": false, "peer-socket-tos": "default", "pex-enabled": true, "port-forwarding-enabled": true, @@ -49,7 +49,7 @@ "rpc-host-whitelist": "", "rpc-host-whitelist-enabled": false, "rpc-password": "{6d8c6eafffb8ae980db6f2d7e2c36dbf8d111479Z/5l3mfq", - "rpc-port": {{ transmission_port }}, + "rpc-port": {{ transmission_web_port }}, "rpc-url": "/transmission/", "rpc-username": "transmission", "rpc-whitelist": "127.0.0.1, {{ vpn_listen_address[:-1] }}*", diff --git a/vars/transmission.yml b/vars/transmission.yml index 85db5db..54cf3b4 100644 --- a/vars/transmission.yml +++ b/vars/transmission.yml @@ -1,4 +1,5 @@ -transmission_port: 9091 +transmission_port: 50409 +transmission_web_port: 9091 transmission_download_folder: '/home/sonny/media/downloads' transmission_incomplete_folder: '/home/sonny/media/downloads/Incompleet' transmission_ratelimit_ratio: 2