fix vpnserver

site.yml

@@ -75,14 +75,9 @@
     - { 
         role: testserver/docker_vpnserver, tags: [ test_vpnserver, docker_services ],
         servicename: "vpnserver",
-<<<<<<< HEAD
         basedir: "/srv/{{ servicename }}", 
         domain: "vpn.test-warpzone.de"
       }
-=======
-        basedir: "/srv/{{ servicename }}",
-        domain: "vpn.test-warpzone.de" 
-      }
     - { 
         role: testserver/docker_wordpress, tags: [ test_wordpress, docker_services ],
         servicename: "wordpress",
@@ -90,7 +85,6 @@
         domain: "www.test-warpzone.de" 
       }
 
->>>>>>> 05a590624d0fea6f62e811b01b3dce975c7005c4
 
 ##################################################
 # Produktive Server

testserver/docker_vpnserver/tasks/main.yml

@@ -7,22 +7,6 @@
     - { path: "{{ basedir }}/secrets/wg_private_key",  length: -1 } # 'wg genkey'
 
 
-- name: install wireguard
-  ansible.builtin.package:
-    name:
-      - wireguard
-      - iptables 
-    state: present
-
-- name: enable wireguard and iptables modules
-  community.general.modprobe:
-    name: "{{ item }}"
-    state: present
-    persistent: present
-  loop:
-    - wireguard
-    - iptables
-
 - name: create folder struct for vpnserver
   file:
     path: "{{ item }}"

testserver/docker_vpnserver/templates/docker-compose.yml

@@ -17,6 +17,8 @@ services:
     devices:
       - "/dev/net/tun:/dev/net/tun"
     environment:
+      - "WG_ADMIN_USERNAME=vpnadmin"
+      - "WG_ADMIN_PASSWORD={{ wg_admin_pass }}"
       - "WG_WIREGUARD_PRIVATE_KEY={{ wg_private_key }}"
       - "WG_VPN_CIDRV6=0" # to disable IPv6
       - "WG_EXTERNAL_HOST={{ domain }}"