diff --git a/servers/ansible/playbook.yaml b/servers/ansible/playbook.yaml index daff191a..8b45cc8d 100644 --- a/servers/ansible/playbook.yaml +++ b/servers/ansible/playbook.yaml @@ -11,6 +11,11 @@ # ansible.posix.synchronize: # src: ./conduwuit-testing # dest: /var/opt/ + - name: Enable netavark dhcp daemon + ansible.builtin.systemd: + name: netavark-dhcp-proxy.socket + enabled: true + state: started - name: Copy containers ansible.posix.synchronize: src: ../containers/ @@ -26,7 +31,7 @@ ansible.posix.synchronize: src: ../logrotate.d/ dest: /etc/logrotate.d - - name: find files with possible suspect line endings + - name: find files with possible suspect line endings or perms ansible.builtin.find: paths: /etc/logrotate.d patterns: '*' @@ -34,6 +39,10 @@ - name: fix suspect line endings replace: path={{item.path}} regexp="\r" with_items: "{{ output.files }}" + - name: fix logrotate permissions + file: path={{item.path}} mode=644 user=root group=root + with_items: "{{ output.files }}" + become_user: root - name: Copy traefik config ansible.posix.synchronize: src: ../traefik/ diff --git a/servers/containers/maubot.container b/servers/containers/maubot.container index 04e3eace..7a04f282 100644 --- a/servers/containers/maubot.container +++ b/servers/containers/maubot.container @@ -14,7 +14,8 @@ Image=dock.mau.dev/maubot/maubot:latest # ReadOnly=true Volume=/var/opt/maubot:/data:z,U AutoUpdate=registry -# Network=web.network= +# Network=web.network +# Network=pub.network Label="traefik.enable=true" Label="traefik.http.routers.maubot.rule=Host(`maubot.ellis.link`)" diff --git a/servers/containers/pub.network b/servers/containers/pub.network new file mode 100644 index 00000000..fbddf326 --- /dev/null +++ b/servers/containers/pub.network @@ -0,0 +1,7 @@ +[Network] +DisableDNS=false +IPv6=true +Subnet=10.89.1.0/24 +Gateway=10.89.1.1 +Driver=macvlan +Options=parent=eno1 \ No newline at end of file