diff --git a/playbooks/linux/ubuntu-server/nextcloud_full_deployment/deploy_collabora_code.yml b/playbooks/linux/ubuntu-server/nextcloud_full_deployment/deploy_collabora_code.yml index 2ce9ce3..2de73d4 100644 --- a/playbooks/linux/ubuntu-server/nextcloud_full_deployment/deploy_collabora_code.yml +++ b/playbooks/linux/ubuntu-server/nextcloud_full_deployment/deploy_collabora_code.yml @@ -129,11 +129,16 @@ - rewrite - headers - - name: Deploy Nextcloud Apache virtual host (HTTP redirect + HTTPS) + - name: Deploy Collabora Apache virtual host (HTTP redirect + HTTPS) ansible.builtin.copy: - dest: /etc/apache2/sites-available/nextcloud.conf + dest: /etc/apache2/sites-available/collabora.conf mode: "0644" content: | + + ServerName {{ collabora_code_domain }} + RewriteEngine On + RewriteRule ^(.*)$ https://%{HTTP_HOST}$1 [R=301,L] + ServerName {{ collabora_code_domain }} Options -Indexes diff --git a/playbooks/linux/ubuntu-server/nextcloud_full_deployment/vars/shared_vars.yml b/playbooks/linux/ubuntu-server/nextcloud_full_deployment/vars/shared_vars.yml index fbcfe65..a907c2d 100644 --- a/playbooks/linux/ubuntu-server/nextcloud_full_deployment/vars/shared_vars.yml +++ b/playbooks/linux/ubuntu-server/nextcloud_full_deployment/vars/shared_vars.yml @@ -1,6 +1,6 @@ nextcloud_version: "34.0.0" nextcloud_domain: "cloud.test.local" -nextcloud_data_dir: "/etc/nextcloud/data" +nextcloud_data_dir: "/etc/nextcloud/data" # /etc/nextcloud is recommendet as the install dir by the hardening guide! nextcloud_install_dir: "/etc/nextcloud" nc_db_name: "nextcloud"