diff --git a/playbook.yml b/playbook.yml index 678c2b1..ce09c6a 100644 --- a/playbook.yml +++ b/playbook.yml @@ -8,7 +8,6 @@ - common tasks: - import_tasks: 'tasks/setup.yml' - - import_tasks: 'tasks/openvpn.yml' - import_tasks: 'tasks/nfs.yml' - import_tasks: 'tasks/radicale.yml' - import_tasks: 'tasks/syncthing.yml' diff --git a/templates/mpd.j2 b/templates/mpd.j2 index 0ad3a65..900b38f 100644 --- a/templates/mpd.j2 +++ b/templates/mpd.j2 @@ -62,7 +62,7 @@ user "sonny" # activation is in use. # # For network -bind_to_address "{{ mpd_listen_address }}" +bind_to_address "{{ vpn_listen_address }}" # # This setting is the TCP port that is desired for the daemon to get assigned @@ -93,17 +93,13 @@ input { # blocks. Setting this block is optional, though the server will only attempt # autodetection for one sound card. # +{% for peer in vpn_peers %} audio_output { type "pulse" - name "Pulse remote laptop" - server "10.8.1.6" -} - -audio_output { - type "pulse" - name "Pulse remote desktop" - server "10.8.1.10" + name "Pulse remote {{ peer.name }}" + server "{{ peer.ip }}" } +{% endfor %} # # Character Encoding ########################################################## diff --git a/templates/nftables.j2 b/templates/nftables.j2 index a18e536..4e9402e 100644 --- a/templates/nftables.j2 +++ b/templates/nftables.j2 @@ -19,17 +19,14 @@ table ip filter { # allow icmp ip protocol icmp accept - 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 {{ ssh_port }} accept comment 'SSH' + iifname 'br0' tcp dport { {{ http_port }}, {{ https_port }} } accept comment 'HTTP/HTTPS' - iifname "br0" tcp dport {{ vpn_mobile_port }} accept comment "OpenVPN TCP" - iifname "br0" udp dport {{ vpn_mobile_port }} accept comment "OpenVPN UDP" - iifname "br0" tcp dport {{ vpn_lan_port }} accept comment "OpenVPN LAN TCP" - iifname "br0" udp dport {{ vpn_lan_port }} accept comment "OpenVPN LAN UDP" + iifname 'br0' tcp dport {{ vpn_port }} accept comment 'Wireguard' - iifname { "tun0", "tun1" } tcp dport { {{ http_port }}, {{ https_port }} } ip saddr { 10.8.0.0/24, 10.8.1.0/24 } ip daddr 10.8.0.1/32 accept comment "HTTP/HTTPS" - iifname { "tun0", "tun1" } tcp dport {{ transmission_port }} ip saddr { 10.8.0.0/24, 10.8.1.0/24 } ip daddr 10.8.0.1/32 accept comment "Transmission" - iifname { "tun0", "tun1" } tcp dport { {{ syncthing_gui_port }}, {{ syncthing_protocol_port }} } ip saddr { 10.8.0.0/24, 10.8.1.0/24 } ip daddr 10.8.0.1/32 accept comment "Syncthing" - iifname { "tun0", "tun1" } tcp dport {{ mpd_port }} ip saddr { 10.8.0.0/24, 10.8.1.0/24 } ip daddr 10.8.0.1/32 accept comment "MPD" + 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 { {{ 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/openvpn/server-lan.j2 b/templates/openvpn/server-lan.j2 deleted file mode 100644 index 15b4c3a..0000000 --- a/templates/openvpn/server-lan.j2 +++ /dev/null @@ -1,317 +0,0 @@ -# {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }} -################################################# -# Sample OpenVPN 2.0 config file for # -# multi-client server. # -# # -# This file is for the server side # -# of a many-clients <-> one-server # -# OpenVPN configuration. # -# # -# OpenVPN also supports # -# single-machine <-> single-machine # -# configurations (See the Examples page # -# on the web site for more info). # -# # -# This config should work on Windows # -# or Linux/BSD systems. Remember on # -# Windows to quote pathnames and use # -# double backslashes, e.g.: # -# "C:\\Program Files\\OpenVPN\\config\\foo.key" # -# # -# Comments are preceded with '#' or ';' # -################################################# - -# Which local IP address should OpenVPN -# listen on? (optional) -local {{ vpn_local_ip }} - -# Which TCP/UDP port should OpenVPN listen on? -# If you want to run multiple OpenVPN instances -# on the same machine, use a different port -# number for each one. You will need to -# open up this port on your firewall. -port {{ vpn_lan_port }} - -# TCP or UDP server? -proto {{ vpn_protocol }} - -# "dev tun" will create a routed IP tunnel, -# "dev tap" will create an ethernet tunnel. -# Use "dev tap0" if you are ethernet bridging -# and have precreated a tap0 virtual interface -# and bridged it with your ethernet interface. -# If you want to control access policies -# over the VPN, you must create firewall -# rules for the the TUN/TAP interface. -# On non-Windows systems, you can give -# an explicit unit number, such as tun0. -# On Windows, use "dev-node" for this. -# On most systems, the VPN will not function -# unless you partially or fully disable -# the firewall for the TUN/TAP interface. -dev tun - -# Windows needs the TAP-Win32 adapter name -# from the Network Connections panel if you -# have more than one. On XP SP2 or higher, -# you may need to selectively disable the -# Windows firewall for the TAP adapter. -# Non-Windows systems usually don't need this. -;dev-node MyTap - -# SSL/TLS root certificate (ca), certificate -# (cert), and private key (key). Each client -# and the server must have their own cert and -# key file. The server and all clients will -# use the same ca file. -# -# See the "easy-rsa" directory for a series -# of scripts for generating RSA certificates -# and private keys. Remember to use -# a unique Common Name for the server -# and each of the client certificates. -# -# Any X509 key management system can be used. -# OpenVPN can also use a PKCS #12 formatted key file -# (see "pkcs12" directive in man page). -ca /etc/openvpn/easy-rsa/keys/ca.crt -cert /etc/openvpn/easy-rsa/keys/server.crt -key /etc/openvpn/easy-rsa/keys/server.key - -# Diffie hellman parameters. -# Generate your own with: -# openssl dhparam -out dh2048.pem 2048 -dh /etc/openvpn/easy-rsa/keys/dh2048.pem - -# Network topology -# Should be subnet (addressing via IP) -# unless Windows clients v2.0.9 and lower have to -# be supported (then net30, i.e. a /30 per client) -# Defaults to net30 (not recommended) -;topology subnet - -# Configure server mode and supply a VPN subnet -# for OpenVPN to draw client addresses from. -# The server will take 10.8.0.1 for itself, -# the rest will be made available to clients. -# Each client will be able to reach the server -# on 10.8.0.1. Comment this line out if you are -# ethernet bridging. See the man page for more info. -server 10.8.0.0 255.255.255.0 - -# Maintain a record of client <-> virtual IP address -# associations in this file. If OpenVPN goes down or -# is restarted, reconnecting clients can be assigned -# the same virtual IP address from the pool that was -# previously assigned. -ifconfig-pool-persist ipp.txt - -# Configure server mode for ethernet bridging. -# You must first use your OS's bridging capability -# to bridge the TAP interface with the ethernet -# NIC interface. Then you must manually set the -# IP/netmask on the bridge interface, here we -# assume 10.8.0.4/255.255.255.0. Finally we -# must set aside an IP range in this subnet -# (start=10.8.0.50 end=10.8.0.100) to allocate -# to connecting clients. Leave this line commented -# out unless you are ethernet bridging. -;server-bridge 10.8.0.4 255.255.255.0 10.8.0.50 10.8.0.100 - -# Configure server mode for ethernet bridging -# using a DHCP-proxy, where clients talk -# to the OpenVPN server-side DHCP server -# to receive their IP address allocation -# and DNS server addresses. You must first use -# your OS's bridging capability to bridge the TAP -# interface with the ethernet NIC interface. -# Note: this mode only works on clients (such as -# Windows), where the client-side TAP adapter is -# bound to a DHCP client. -;server-bridge - -# Push routes to the client to allow it -# to reach other private subnets behind -# the server. Remember that these -# private subnets will also need -# to know to route the OpenVPN client -# address pool (10.8.0.0/255.255.255.0) -# back to the OpenVPN server. -;push "route 192.168.10.0 255.255.255.0" - -# To assign specific IP addresses to specific -# clients or if a connecting client has a private -# subnet behind it that should also have VPN access, -# use the subdirectory "ccd" for client-specific -# configuration files (see man page for more info). - -# EXAMPLE: Suppose the client -# having the certificate common name "Thelonious" -# also has a small subnet behind his connecting -# machine, such as 192.168.40.128/255.255.255.248. -# First, uncomment out these lines: -;client-config-dir ccd -;route 192.168.40.128 255.255.255.248 - -# Then create a file ccd/Thelonious with this line: -# iroute 192.168.40.128 255.255.255.248 -# This will allow Thelonious' private subnet to -# access the VPN. This example will only work -# if you are routing, not bridging, i.e. you are -# using "dev tun" and "server" directives. - -# EXAMPLE: Suppose you want to give -# Thelonious a fixed VPN IP address of 10.9.0.1. -# First uncomment out these lines: -;client-config-dir ccd -;route 10.9.0.0 255.255.255.252 - -# Then add this line to ccd/Thelonious: -# ifconfig-push 10.9.0.1 10.9.0.2 - -# Suppose that you want to enable different -# firewall access policies for different groups -# of clients. There are two methods: -# (1) Run multiple OpenVPN daemons, one for each -# group, and firewall the TUN/TAP interface -# for each group/daemon appropriately. -# (2) (Advanced) Create a script to dynamically -# modify the firewall in response to access -# from different clients. See man -# page for more info on learn-address script. -;learn-address ./script - -# If enabled, this directive will configure -# all clients to redirect their default -# network gateway through the VPN, causing -# all IP traffic such as web browsing and -# and DNS lookups to go through the VPN -# (The OpenVPN server machine may need to NAT -# or bridge the TUN/TAP interface to the internet -# in order for this to work properly). -;push "redirect-gateway def1 bypass-dhcp" - -# Certain Windows-specific network settings -# can be pushed to clients, such as DNS -# or WINS server addresses. CAVEAT: -# http://openvpn.net/faq.html#dhcpcaveats -# The addresses below refer to the public -# DNS servers provided by opendns.com. -;push "dhcp-option DNS 208.67.222.222" - -# Uncomment this directive to allow different -# clients to be able to "see" each other. -# By default, clients will only see the server. -# To force clients to only see the server, you -# will also need to appropriately firewall the -# server's TUN/TAP interface. -client-to-client - -# Uncomment this directive if multiple clients -# might connect with the same certificate/key -# files or common names. This is recommended -# only for testing purposes. For production use, -# each client should have its own certificate/key -# pair. -# -# IF YOU HAVE NOT GENERATED INDIVIDUAL -# CERTIFICATE/KEY PAIRS FOR EACH CLIENT, -# EACH HAVING ITS OWN UNIQUE "COMMON NAME", -# UNCOMMENT THIS LINE OUT. -;duplicate-cn - -# The keepalive directive causes ping-like -# messages to be sent back and forth over -# the link so that each side knows when -# the other side has gone down. -# Ping every 10 seconds, assume that remote -# peer is down if no ping received during -# a 120 second time period. -keepalive 10 120 - -# try forever to resolve peer name -resolv-retry infinite - -# Don't ping until connected to remote -ping-timer-rem - -# For extra security beyond that provided -# by SSL/TLS, create an "HMAC firewall" -# to help block DoS attacks and UDP port flooding. -# -# Generate with: -# openvpn --genkey --secret ta.key -# -# The server and each client must have -# a copy of this key. -# The second parameter should be '0' -# on the server and '1' on the clients. -tls-auth /etc/openvpn/easy-rsa/keys/ta.key 0 -auth SHA512 - -# Select a cryptographic cipher. -# This config item must be copied to -# the client config file as well. -cipher AES-256-CBC -tls-version-min 1.2 - -# Enable compression on the VPN link. -# If you enable it here, you must also -# enable it in the client config file. -;comp-lzo - -# The maximum number of concurrently connected -# clients we want to allow. -;max-clients 1 - -# It's a good idea to reduce the OpenVPN -# daemon's privileges after initialization. -# -# You can uncomment this out on -# non-Windows systems. -user nobody -group nogroup - -# The persist options will try to avoid -# accessing certain resources on restart -# that may no longer be accessible because -# of the privilege downgrade. -persist-key -persist-tun - -# Output a short status file showing -# current connections, truncated -# and rewritten every minute. -status openvpn-lan-status.log - -# By default, log messages will go to the syslog (or -# on Windows, if running as a service, they will go to -# the "\Program Files\OpenVPN\log" directory). -# Use log or log-append to override this default. -# "log" will truncate the log file on OpenVPN startup, -# while "log-append" will append to it. Use one -# or the other (but not both). -;log openvpn.log - -# Set the appropriate level of log -# file verbosity. -# -# 0 is silent, except for fatal errors -# 4 is reasonable for general usage -# 5 and 6 can help to debug connection problems -# 9 is extremely verbose -verb 4 - -# Silence repeating messages. At most 20 -# sequential messages of the same message -# category will be output to the log. -;mute 20 - -# Disable the internal fragmentation alghorithm -# this can be done by the kernel network driver from the OS -fragment 0 -mssfix 0 - -# Enable jumbo frames, note that this could lead to problems on bad connections -# e.g. mobile users or laptop users see https://community.openvpn.net/openvpn/wiki/Gigabit_Networks_Linux#Tweakedsetup -tun-mtu 24000 diff --git a/templates/openvpn/server-mobile.j2 b/templates/openvpn/server-mobile.j2 deleted file mode 100644 index 26ef05a..0000000 --- a/templates/openvpn/server-mobile.j2 +++ /dev/null @@ -1,316 +0,0 @@ -# {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }} -################################################# -# Sample OpenVPN 2.0 config file for # -# multi-client server. # -# # -# This file is for the server side # -# of a many-clients <-> one-server # -# OpenVPN configuration. # -# # -# OpenVPN also supports # -# single-machine <-> single-machine # -# configurations (See the Examples page # -# on the web site for more info). # -# # -# This config should work on Windows # -# or Linux/BSD systems. Remember on # -# Windows to quote pathnames and use # -# double backslashes, e.g.: # -# "C:\\Program Files\\OpenVPN\\config\\foo.key" # -# # -# Comments are preceded with '#' or ';' # -################################################# - -# Which local IP address should OpenVPN -# listen on? (optional) -local {{ vpn_local_ip }} - -# Which TCP/UDP port should OpenVPN listen on? -# If you want to run multiple OpenVPN instances -# on the same machine, use a different port -# number for each one. You will need to -# open up this port on your firewall. -port {{ vpn_mobile_port }} - -# TCP or UDP server? -proto {{ vpn_protocol }} - -# "dev tun" will create a routed IP tunnel, -# "dev tap" will create an ethernet tunnel. -# Use "dev tap0" if you are ethernet bridging -# and have precreated a tap0 virtual interface -# and bridged it with your ethernet interface. -# If you want to control access policies -# over the VPN, you must create firewall -# rules for the the TUN/TAP interface. -# On non-Windows systems, you can give -# an explicit unit number, such as tun0. -# On Windows, use "dev-node" for this. -# On most systems, the VPN will not function -# unless you partially or fully disable -# the firewall for the TUN/TAP interface. -dev tun - -# Windows needs the TAP-Win32 adapter name -# from the Network Connections panel if you -# have more than one. On XP SP2 or higher, -# you may need to selectively disable the -# Windows firewall for the TAP adapter. -# Non-Windows systems usually don't need this. -;dev-node MyTap - -# SSL/TLS root certificate (ca), certificate -# (cert), and private key (key). Each client -# and the server must have their own cert and -# key file. The server and all clients will -# use the same ca file. -# -# See the "easy-rsa" directory for a series -# of scripts for generating RSA certificates -# and private keys. Remember to use -# a unique Common Name for the server -# and each of the client certificates. -# -# Any X509 key management system can be used. -# OpenVPN can also use a PKCS #12 formatted key file -# (see "pkcs12" directive in man page). -ca /etc/openvpn/easy-rsa/keys/ca.crt -cert /etc/openvpn/easy-rsa/keys/server.crt -key /etc/openvpn/easy-rsa/keys/server.key - -# Diffie hellman parameters. -# Generate your own with: -# openssl dhparam -out dh2048.pem 2048 -dh /etc/openvpn/easy-rsa/keys/dh2048.pem - -# Network topology -# Should be subnet (addressing via IP) -# unless Windows clients v2.0.9 and lower have to -# be supported (then net30, i.e. a /30 per client) -# Defaults to net30 (not recommended) -;topology subnet - -# Configure server mode and supply a VPN subnet -# for OpenVPN to draw client addresses from. -# The server will take 10.8.0.1 for itself, -# the rest will be made available to clients. -# Each client will be able to reach the server -# on 10.8.0.1. Comment this line out if you are -# ethernet bridging. See the man page for more info. -server 10.8.1.0 255.255.255.0 - -# Maintain a record of client <-> virtual IP address -# associations in this file. If OpenVPN goes down or -# is restarted, reconnecting clients can be assigned -# the same virtual IP address from the pool that was -# previously assigned. -ifconfig-pool-persist ipp.txt - -# Configure server mode for ethernet bridging. -# You must first use your OS's bridging capability -# to bridge the TAP interface with the ethernet -# NIC interface. Then you must manually set the -# IP/netmask on the bridge interface, here we -# assume 10.8.0.4/255.255.255.0. Finally we -# must set aside an IP range in this subnet -# (start=10.8.0.50 end=10.8.0.100) to allocate -# to connecting clients. Leave this line commented -# out unless you are ethernet bridging. -;server-bridge 10.8.0.4 255.255.255.0 10.8.0.50 10.8.0.100 - -# Configure server mode for ethernet bridging -# using a DHCP-proxy, where clients talk -# to the OpenVPN server-side DHCP server -# to receive their IP address allocation -# and DNS server addresses. You must first use -# your OS's bridging capability to bridge the TAP -# interface with the ethernet NIC interface. -# Note: this mode only works on clients (such as -# Windows), where the client-side TAP adapter is -# bound to a DHCP client. -;server-bridge - -# Push routes to the client to allow it -# to reach other private subnets behind -# the server. Remember that these -# private subnets will also need -# to know to route the OpenVPN client -# address pool (10.8.0.0/255.255.255.0) -# back to the OpenVPN server. -push "route 10.8.0.0 255.255.255.0" - -# To assign specific IP addresses to specific -# clients or if a connecting client has a private -# subnet behind it that should also have VPN access, -# use the subdirectory "ccd" for client-specific -# configuration files (see man page for more info). - -# EXAMPLE: Suppose the client -# having the certificate common name "Thelonious" -# also has a small subnet behind his connecting -# machine, such as 192.168.40.128/255.255.255.248. -# First, uncomment out these lines: -;client-config-dir ccd -;route 192.168.40.128 255.255.255.248 - -# Then create a file ccd/Thelonious with this line: -# iroute 192.168.40.128 255.255.255.248 -# This will allow Thelonious' private subnet to -# access the VPN. This example will only work -# if you are routing, not bridging, i.e. you are -# using "dev tun" and "server" directives. - -# EXAMPLE: Suppose you want to give -# Thelonious a fixed VPN IP address of 10.9.0.1. -# First uncomment out these lines: -;client-config-dir ccd -;route 10.9.0.0 255.255.255.252 - -# Then add this line to ccd/Thelonious: -# ifconfig-push 10.9.0.1 10.9.0.2 - -# Suppose that you want to enable different -# firewall access policies for different groups -# of clients. There are two methods: -# (1) Run multiple OpenVPN daemons, one for each -# group, and firewall the TUN/TAP interface -# for each group/daemon appropriately. -# (2) (Advanced) Create a script to dynamically -# modify the firewall in response to access -# from different clients. See man -# page for more info on learn-address script. -;learn-address ./script - -# If enabled, this directive will configure -# all clients to redirect their default -# network gateway through the VPN, causing -# all IP traffic such as web browsing and -# and DNS lookups to go through the VPN -# (The OpenVPN server machine may need to NAT -# or bridge the TUN/TAP interface to the internet -# in order for this to work properly). -;push "redirect-gateway def1 bypass-dhcp" - -# Certain Windows-specific network settings -# can be pushed to clients, such as DNS -# or WINS server addresses. CAVEAT: -# http://openvpn.net/faq.html#dhcpcaveats -# The addresses below refer to the public -# DNS servers provided by opendns.com. -;push "dhcp-option DNS 208.67.222.222" - -# Uncomment this directive to allow different -# clients to be able to "see" each other. -# By default, clients will only see the server. -# To force clients to only see the server, you -# will also need to appropriately firewall the -# server's TUN/TAP interface. -client-to-client - -# Uncomment this directive if multiple clients -# might connect with the same certificate/key -# files or common names. This is recommended -# only for testing purposes. For production use, -# each client should have its own certificate/key -# pair. -# -# IF YOU HAVE NOT GENERATED INDIVIDUAL -# CERTIFICATE/KEY PAIRS FOR EACH CLIENT, -# EACH HAVING ITS OWN UNIQUE "COMMON NAME", -# UNCOMMENT THIS LINE OUT. -;duplicate-cn - -# The keepalive directive causes ping-like -# messages to be sent back and forth over -# the link so that each side knows when -# the other side has gone down. -# Ping every 10 seconds, assume that remote -# peer is down if no ping received during -# a 120 second time period. -keepalive 10 120 - -# try forever to resolve peer name -resolv-retry infinite - -# Don't ping until connected to remote -ping-timer-rem - -# For extra security beyond that provided -# by SSL/TLS, create an "HMAC firewall" -# to help block DoS attacks and UDP port flooding. -# -# Generate with: -# openvpn --genkey --secret ta.key -# -# The server and each client must have -# a copy of this key. -# The second parameter should be '0' -# on the server and '1' on the clients. -tls-auth /etc/openvpn/easy-rsa/keys/ta.key 0 -auth SHA512 - -# Select a cryptographic cipher. -# This config item must be copied to -# the client config file as well. -cipher AES-256-CBC -tls-version-min 1.2 - -# Enable compression on the VPN link. -# If you enable it here, you must also -# enable it in the client config file. -# Disabled as advised on https://openvpn.net/security-advisories/ -#compress lz4 - -# The maximum number of concurrently connected -# clients we want to allow. -max-clients 10 - -# It's a good idea to reduce the OpenVPN -# daemon's privileges after initialization. -# -# You can uncomment this out on -# non-Windows systems. -user nobody -group nogroup - -# The persist options will try to avoid -# accessing certain resources on restart -# that may no longer be accessible because -# of the privilege downgrade. -persist-key -persist-tun - -# Output a short status file showing -# current connections, truncated -# and rewritten every minute. -status openvpn-mobile-status.log - -# By default, log messages will go to the syslog (or -# on Windows, if running as a service, they will go to -# the "\Program Files\OpenVPN\log" directory). -# Use log or log-append to override this default. -# "log" will truncate the log file on OpenVPN startup, -# while "log-append" will append to it. Use one -# or the other (but not both). -;log openvpn.log - -# Set the appropriate level of log -# file verbosity. -# -# 0 is silent, except for fatal errors -# 4 is reasonable for general usage -# 5 and 6 can help to debug connection problems -# 9 is extremely verbose -verb 4 - -# Silence repeating messages. At most 20 -# sequential messages of the same message -# category will be output to the log. -mute 5 - -# Disable the internal fragmentation alghorithm -# this can be done by the kernel network driver from the OS -fragment 0 -mssfix 0 - -txqueuelen 1000 diff --git a/templates/syncthing.j2 b/templates/syncthing.j2 index cea67de..687f0b3 100644 --- a/templates/syncthing.j2 +++ b/templates/syncthing.j2 @@ -76,7 +76,7 @@ true -
tcp://10.8.1.10:22000
+
dynamic
false false 0 @@ -96,7 +96,7 @@ 0 -
tcp://10.8.1.6:22000
+
dynamic
false false 0 @@ -106,7 +106,7 @@ 0 -
{{ syncthing_gui_address }}:{{ syncthing_gui_port }}
+
{{ vpn_listen_address }}:{{ syncthing_gui_port }}
platvoeten $2a$10$1WqvnXwMfqTU6072LZmxTOkpbqE2osM4G8TrdXfEfkUM1ZEC8I.CK 6T6cWRLpeXC44ZRoe7QcaKZpHJu2Wug3 @@ -114,7 +114,7 @@ - {{ syncthing_listen_address }}:{{ syncthing_protocol_port }} + {{ vpn_listen_address }}:{{ syncthing_protocol_port }} default true true diff --git a/templates/transmission.j2 b/templates/transmission.j2 index 0148907..5f59729 100644 --- a/templates/transmission.j2 +++ b/templates/transmission.j2 @@ -44,7 +44,7 @@ "ratio-limit-enabled": false, "rename-partial-files": true, "rpc-authentication-required": false, - "rpc-bind-address": "{{ transmission_rpc_address }}", + "rpc-bind-address": "{{ vpn_listen_address }}", "rpc-enabled": true, "rpc-host-whitelist": "", "rpc-host-whitelist-enabled": false, @@ -52,7 +52,7 @@ "rpc-port": {{ transmission_port }}, "rpc-url": "/transmission/", "rpc-username": "transmission", - "rpc-whitelist": "{{ transmission_rpc_whitelist }}", + "rpc-whitelist": "127.0.0.1, {{ vpn_listen_address:[-1] }}*", "rpc-whitelist-enabled": true, "scrape-paused-torrents-enabled": true, "script-torrent-done-enabled": false, diff --git a/vars/mpd.yml b/vars/mpd.yml index f8f63a4..ef78d01 100644 --- a/vars/mpd.yml +++ b/vars/mpd.yml @@ -1,4 +1,3 @@ -mpd_listen_address: '10.8.0.1' mpd_port: 21000 mpd_http_port: 21001 diff --git a/vars/syncthing.yml b/vars/syncthing.yml index 70a85f3..387c4c8 100644 --- a/vars/syncthing.yml +++ b/vars/syncthing.yml @@ -1,6 +1,3 @@ -syncthing_listen_address: '10.8.0.1' -syncthing_gui_address: '10.8.0.1' - syncthing_gui_port: 8384 syncthing_protocol_port: 22000 diff --git a/vars/transmission.yml b/vars/transmission.yml index c42e8cd..85db5db 100644 --- a/vars/transmission.yml +++ b/vars/transmission.yml @@ -1,6 +1,4 @@ transmission_port: 9091 transmission_download_folder: '/home/sonny/media/downloads' transmission_incomplete_folder: '/home/sonny/media/downloads/Incompleet' -transmission_rpc_whitelist: '127.0.0.1,10.8.0.*, 10.8.1.*' -transmission_rpc_address: '10.8.0.1' transmission_ratelimit_ratio: 2 diff --git a/vars/vpn.yml b/vars/vpn.yml index 7d8d2ad..762680d 100644 --- a/vars/vpn.yml +++ b/vars/vpn.yml @@ -1,7 +1,15 @@ -vpn_listen_address: '10.8.0.1' +vpn_listen_address: '10.0.0.1' vpn_local_ip: '192.168.178.185' +vpn_port: '51902' +vpn_interface: 'wg0' -vpn_mobile_port: '1194' -vpn_lan_port: '20000' +vpn_source_range: '10.0.0.0/24' +vpn_destination_range: '10.0.0.1/32' -vpn_protocol: 'udp' +vpn_peers: + - { + name: 'desktop', ip: '10.0.0.3' + } + - { + name: 'laptop', ip: '10.0.0.2' + }