diff --git a/ansible/main.yml b/ansible/main.yml index d69260b..cbdaea5 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -15,9 +15,10 @@ - firefly3 - overseerr - ntfy - - nextcloud - - name: qbittorrent + - qbittorrent + - name: gluetun tags: test + - nextcloud - readarr - calibre - calibre-web @@ -32,7 +33,7 @@ - slskd - navidrome - lidarr - - gluetun + - recyclarr - searxng - synapse - rimgo diff --git a/ansible/roles/gluetun/templates/docker-compose.yml b/ansible/roles/gluetun/templates/docker-compose.yml index fc207d6..b7c0ff4 100644 --- a/ansible/roles/gluetun/templates/docker-compose.yml +++ b/ansible/roles/gluetun/templates/docker-compose.yml @@ -20,12 +20,12 @@ services: environment: VPN_TYPE: wireguard VPN_SERVICE_PROVIDER: custom - WIREGUARD_PRIVATE_KEY: "{{ wireguard_private_key }}" - WIREGUARD_PUBLIC_KEY: "h7l7Uw9Fhmsk5tUGdvL/FmI0ogEuJVsv/+wqu9pr1A8=" - WIREGUARD_ADDRESSES: "10.13.128.101/24" - VPN_ENDPOINT_IP: "146.70.137.50" + WIREGUARD_PRIVATE_KEY: "{{ torguard_private_key }}" + WIREGUARD_PUBLIC_KEY: "sC96pq087HvVpRNA5oKjiotwGuRRZbdLiTgmqP+Du2s=" + WIREGUARD_ADDRESSES: "{{ torguard_address }}" + VPN_ENDPOINT_IP: "146.70.137.122" VPN_ENDPOINT_PORT: "1443" - FIREWALL_VPN_INPUT_PORTS: "13221" + FIREWALL_VPN_INPUT_PORTS: "55230" DOT: "off" DNS_ADDRESS: "9.9.9.9" TZ: "{{ timezone }}" diff --git a/ansible/roles/gluetun/vars/main.yml b/ansible/roles/gluetun/vars/main.yml index 556f813..103abbf 100644 --- a/ansible/roles/gluetun/vars/main.yml +++ b/ansible/roles/gluetun/vars/main.yml @@ -1,9 +1,17 @@ -wireguard_private_key: !vault | +torguard_private_key: !vault | $ANSIBLE_VAULT;1.1;AES256 - 39653835373739623131316462383066653965623065393364633165346333616132396563383665 - 6366363234386262396634373566396434623463363565340a666435363036383736656337383662 - 31386330323761633838353635616262313233656165306662333035646630343232323766626236 - 6533386334333635620a303535646638316165623134613163613634303566613162386463343335 - 62383564633539363834326161393838383934383266306635363064306533336539623965653766 - 6335643038666637663233306631323963623633623938333738 + 38386463313536353366303733396232663136393431656432346332353131333630343730336262 + 3436633832613935323134393662666233643032613463310a656364653639363739306265306361 + 61616261663139323238636634306330393733393065373138323463653935366335363639626265 + 3862396562393536320a366335363435636436333139356239306262303838333162613530643732 + 64336161306633343866383538303536316163396566326336633961333136373736373364343430 + 3361613566346563346664353834613361616666383065303162 + +torguard_address: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 61626363346663646462626434316566353464623161396362356330333338616466633266383733 + 3363393464616534316339393935646438333764383765370a383236613539613866373838353061 + 39393661393035373132663439653361363761613264656462623237336637356162623439336238 + 6635383734303539640a336366373164336262363630636562636136316166343362306265326163 + 39306365613539383666303130633937643238653635393738323665323938646335