diff --git a/ansible/group_vars/all/oas.yml b/ansible/group_vars/all/oas.yml index 102488c0dc2102e6a0685771171d1fb066bcb2f8..7d403968e857134a9d280cc7ea8d6588f727e1e2 100644 --- a/ansible/group_vars/all/oas.yml +++ b/ansible/group_vars/all/oas.yml @@ -10,7 +10,6 @@ ansible_python_interpreter: "/usr/bin/env python3" nextcloud_password: "{{ lookup('password', '{{ secret_directory }}/nextcloud_admin_password chars=ascii_letters') }}" nextcloud_mariadb_password: "{{ lookup('password', '{{ secret_directory }}/nextcloud_mariadb_password chars=ascii_letters') }}" nextcloud_mariadb_root_password: "{{ lookup('password', '{{ secret_directory }}/nextcloud_mariadb_root_password chars=ascii_letters') }}" -collabora_password: "{{ lookup('password', '{{ secret_directory }}/collabora_admin_password chars=ascii_letters') }}" grafana_admin_password: "{{ lookup('password', '{{ secret_directory }}/grafana_admin_password chars=ascii_letters') }}" # git repo versions diff --git a/ansible/roles/setup/tasks/helmfiles.yml b/ansible/roles/setup/tasks/helmfiles.yml index 71a131a66ff6c6bcd7de036c0e7316b784c6c135..e7374dcd4ea59bca16747125ecb87d036f7ad562 100644 --- a/ansible/roles/setup/tasks/helmfiles.yml +++ b/ansible/roles/setup/tasks/helmfiles.yml @@ -97,7 +97,6 @@ - helmfile - tmp environment: - - COLLABORA_PASSWORD: "{{ collabora_password }}" - NEXTCLOUD_PASSWORD: "{{ nextcloud_password }}" - NEXTCLOUD_MARIADB_PASSWORD: "{{ nextcloud_mariadb_password }}" - NEXTCLOUD_MARIADB_ROOT_PASSWORD: "{{ nextcloud_mariadb_root_password }}" diff --git a/helmfiles/README.md b/helmfiles/README.md index e50fbd6c95410c8ed767543b7af478b6168fe2d4..00d358802d4d8286b28b267daf8ba802ec7b956f 100644 --- a/helmfiles/README.md +++ b/helmfiles/README.md @@ -42,7 +42,6 @@ Do these three steps to prepare the installation process: 1. You need to set some environment variables: - `$NEXTCLOUD_PASSWORD` to set the Nextcloud administrator password - - `$COLLABORA_PASSWORD` to set the Collabora administrator password - `$NEXTCLOUD_MARIADB_ROOT_PASSWORD` for the MariaDB that NextCloud uses - `$GRAFANA_ADMIN_PASSWORD` for the admin password of grafana diff --git a/test/behave/features/nextcloud.feature b/test/behave/features/nextcloud.feature index e255037e5297b2e599ca66ce56b069c12cc1cc62..2482af3ec14e76f42996810dae6fc152572bcf3d 100644 --- a/test/behave/features/nextcloud.feature +++ b/test/behave/features/nextcloud.feature @@ -2,7 +2,7 @@ Feature: Test nextcloud admin login As an OAS admin I want to be able to login to nextcloud as the user admin - And I want to be able to open a document in Collabora + And I want to be able to open a document in OnlyOffice Scenario: Open nextcloud When I open the nextcloud URL