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 d2eeceb..7905a4e 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 @@ -114,15 +114,15 @@ cmd: > openssl req -x509 -nodes -days 3650 -newkey rsa:4096 - -keyout {{ nc_ssl_key }} - -out {{ nc_ssl_cert }} + -keyout {{ cc_ssl_key }} + -out {{ cc_ssl_cert }} -subj "/CN={{ collabora_code_domain }}/O=Office/C=DE" -addext "subjectAltName=DNS:{{ collabora_code_domain }}" - creates: "{{ nc_ssl_cert }}" + creates: "{{ cc_ssl_cert }}" - name: Restrict private key permissions ansible.builtin.file: - path: "{{ nc_ssl_key }}" + path: "{{ cc_ssl_key }}" owner: root group: root mode: "0600" @@ -193,8 +193,8 @@ ProxyPassReverse /cool http://127.0.0.1:9980/cool SSLEngine on - SSLCertificateFile /etc/ssl/certs/office-selfsigned.crt - SSLCertificateKeyFile /etc/ssl/private/office-selfsigned.key + SSLCertificateFile {{ cc_ssl_cert }} + SSLCertificateKeyFile {{ cc_ssl_key }} - name: Disable default Apache site 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 a4650b1..92785a0 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 @@ -22,7 +22,7 @@ nc_admin_password: "Start2026!" # It is recommended to check what the php requirements are for the Nextcloud version you want to install. The default is set to 8.5, which is the recommended version as of July 2026. nc_php_version: "8.3" -# TLS certificate paths (self-signed, generated by this playbook) +# Nextcloud TLS certificate paths nc_ssl_cert: "/etc/ssl/certs/nextcloud-selfsigned.crt" nc_ssl_key: "/etc/ssl/private/nextcloud-selfsigned.key" @@ -37,4 +37,8 @@ fail2ban_dir: "/etc/fail2ban" collabora_code_domain: "office.test.local" # The admin password for your Collabora COPE server. -collabora_admin_password: "Start2026!" \ No newline at end of file +collabora_admin_password: "Start2026!" + +# Nextcloud TLS certificate paths +cc_ssl_cert: "/etc/ssl/certs/collabora-selfsigned.crt" +cc_ssl_key: "/etc/ssl/private/collabora-selfsigned.key" \ No newline at end of file