diff --git a/roles/dmz_nextcloud_front/templates/nginx_lool.j2 b/roles/dmz_nextcloud_front/templates/nginx_lool.j2 index 04096eb..43e4d7f 100644 --- a/roles/dmz_nextcloud_front/templates/nginx_lool.j2 +++ b/roles/dmz_nextcloud_front/templates/nginx_lool.j2 @@ -7,6 +7,8 @@ location ~ {{http_pfx_nextcloud}}/index.php/apps/richdocuments/(?:css|js|img|l10 rewrite ^{{http_pfx_nextcloud}}/index.php/apps/richdocuments(.*)$ {{http_pfx_nextcloud}}/index.php/xapps/richdocuments$1$is_args$query_string; } +# https://www.collaboraoffice.com/code/nginx-reverse-proxy/ + # static files location ^~ /loleaflet { proxy_pass http://{{SafeZone}}:9980; @@ -19,6 +21,12 @@ location ^~ /hosting/discovery { proxy_set_header Host $http_host; } +# Capabilities +location ^~ /hosting/capabilities { + proxy_pass http://{{SafeZone}}:9980; + proxy_set_header Host $http_host; +} + location ^~ /lool { # this parent location makes sure that a global PHP catch-all # won’t pre-empt the first two child locations below diff --git a/roles/nextcloud_back/tasks/main.yml b/roles/nextcloud_back/tasks/main.yml index a188989..aeb4f4b 100644 --- a/roles/nextcloud_back/tasks/main.yml +++ b/roles/nextcloud_back/tasks/main.yml @@ -65,6 +65,21 @@ become: true become_user: postgres +#- name: change some loolwsd settings +# xml: +# path: /etc/loolwsd/loolwsd.xml +# xpath: "{{item.key}}" +# value: "{{item.value}}" +# with_dict: +# /config/server_name: '{{net_soa}}:443' +# /config/memproportion: '{{loolwsd_maxmem_asdouble}}' +# /config/ssl/enable: 'false' +# /config/ssl/termination: 'true' +# /config/admin_console/username: '{{loolwsd_admin_user}}' +# /config/admin_console/password: '{{loolwsd_admin_password}}' +# notify: +# - restart loolwsd.service + - name: change some loolwsd settings lineinfile: path: /etc/loolwsd/loolwsd.xml @@ -153,6 +168,7 @@ } H;x;b array' \ "{{nextcloud_conf}}/config.php" + warn: false when: - (check_conf_arrays_1.stdout is defined) - (check_conf_arrays_1.stdout != '')