diff --git a/host_vars/ns-master.int.infra.auro.re/knotd.yml b/host_vars/ns-master.int.infra.auro.re/knotd.yml index a2faa4d..774d99f 100644 --- a/host_vars/ns-master.int.infra.auro.re/knotd.yml +++ b/host_vars/ns-master.int.infra.auro.re/knotd.yml @@ -286,6 +286,7 @@ knotd__zones: - re2o - nextcloud - vote + - office target: proxy - name: intranet target: re2o diff --git a/host_vars/proxy.adm.auro.re.yml b/host_vars/proxy.adm.auro.re.yml index 1c28257..fb9fe77 100644 --- a/host_vars/proxy.adm.auro.re.yml +++ b/host_vars/proxy.adm.auro.re.yml @@ -70,3 +70,6 @@ loc_reverseproxy: - from: grafana.auro.re to: "10.128.0.98:3000" + + - from: office.auro.re + to: "10.128.0.220" diff --git a/playbooks/openssh.yml b/playbooks/openssh.yml index f1bcd62..2c52ee9 100755 --- a/playbooks/openssh.yml +++ b/playbooks/openssh.yml @@ -3,8 +3,8 @@ - hosts: - pve_network - vm_test - - vm_network - vm_services + - vm_network roles: - openssh_server ... diff --git a/roles/collabora/handlers/main.yml b/roles/collabora/handlers/main.yml new file mode 100644 index 0000000..fa8d638 --- /dev/null +++ b/roles/collabora/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: Restart Collabora + service: + name: coolwsd + state: restarted diff --git a/roles/collabora/tasks/main.yml b/roles/collabora/tasks/main.yml new file mode 100644 index 0000000..ae8389d --- /dev/null +++ b/roles/collabora/tasks/main.yml @@ -0,0 +1,44 @@ +--- +- name: Install gpg (to import Collabora key) + apt: + name: gpg + state: present + register: apt_result + retries: 3 + until: apt_result is succeeded + +- name: Import Collabora GPG signing key + apt_key: + url: https://www.collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg + state: present + register: apt_key_result + retries: 3 + until: apt_key_result is succeeded + +- name: Add Collabora repository + apt_repository: + repo: deb https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-deb stable main + state: present + update_cache: true + +- name: Install Collabora + apt: + name: coolwsd code-brand collaboraoffice* + state: present + register: apt_result + retries: 3 + until: apt_result is succeeded + +- name: Configure Collabora + template: + src: coolwsd.toml.j2 + dest: /etc/coolwsd/coolwsd.xml + mode: 0640 + notify: Restart grafana + +- name: Enable and start Collabora + systemd: + name: coolwsd + enabled: true + state: started + daemon_reload: true diff --git a/roles/collabora/templates/coolwsd.xml.j2 b/roles/collabora/templates/coolwsd.xml.j2 new file mode 100644 index 0000000..3751e5c --- /dev/null +++ b/roles/collabora/templates/coolwsd.xml.j2 @@ -0,0 +1,331 @@ + + + + + + + + + + true + + + de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru + + + + + + + + + + + + + false + + + + + + + + + office.auro.re + + + true + + 90.0 + 1 + + + 4 + 5 + false + 96 + 3600 + 30 + 300 + false + 0 + 8000 + 0 + 0 + 100 + 5 + 100 + 500 + 5000 + + 10000 + 60 + 300 + 3072 + 85 + 120 + + + + + true + 300 + 900 + + + + + + true + + warning + trace + notice + fatal + false + + -INFO-WARN + + + /var/log/coolwsd.log + never + timestamp + true + 10 days + 10 + true + false + + + false + 82589933 + + false + false + + + + + /var/log/coolwsd.trace.json + + + false + + + + + + + + false + + + + + + all + any + + + + 192\.168\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:192\.168\.[0-9]{1,3}\.[0-9]{1,3} + 127\.0\.0\.1 + ::ffff:127\.0\.0\.1 + ::1 + 172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3} + 172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3} + 172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3} + 10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} + + + 192\.168\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:192\.168\.[0-9]{1,3}\.[0-9]{1,3} + 127\.0\.0\.1 + ::ffff:127\.0\.0\.1 + ::1 + 172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3} + 172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3} + 172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3} + 10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} + localhost + + + + + + + + + + + + true + + false + /etc/coolwsd/cert.pem + /etc/coolwsd/key.pem + /etc/coolwsd/ca-chain.cert.pem + + + 1000 + + + + + + + false + 31536000 + + + + + true + true + 1800 + false + 1 + false + false + + + + + + + + + + + + + + default + true + + + + + + 0 + + 900 + + + + + + + + + + + true + + + + + + + + + + true + false + + + + true + true + true + true + + + + + + + + + + + + + + + + + + + false + + + + + + + false + + + + log + + + + + + + + + + + + true + + + https://help.collaboraoffice.com/help.html? + + + true + + + + + + + +