diff --git a/site.yml b/site.yml index 94aa3332eaef33f84c53ee296f30a8ae3631b4c6..a532b27a159d8fcee3dfc1511e1f41b7de5067fb 100644 --- a/site.yml +++ b/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 diff --git a/testserver/docker_vpnserver/tasks/main.yml b/testserver/docker_vpnserver/tasks/main.yml index db205d305bec18d16af21d57124bd2cdf789d0d6..997783a7eba99d9c3614ae95887a8f4e3df0d7b0 100644 --- a/testserver/docker_vpnserver/tasks/main.yml +++ b/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 }}" diff --git a/testserver/docker_vpnserver/templates/docker-compose.yml b/testserver/docker_vpnserver/templates/docker-compose.yml index f67ebaac112278dbf762c2c31e685359dec01ceb..6616554ce3314078f7f3e2c19928e0383f2dc656 100644 --- a/testserver/docker_vpnserver/templates/docker-compose.yml +++ b/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 }}"