From 4d51ceaedfba037dcfd52da4a67a2737ac9900e8 Mon Sep 17 00:00:00 2001
From: Arie Peterson <arie@greenhost.nl>
Date: Tue, 16 Jul 2019 11:27:03 +0200
Subject: [PATCH] Remove references to Collabora
---
ansible/group_vars/all/oas.yml | 1 -
ansible/roles/setup/tasks/helmfiles.yml | 1 -
helmfiles/README.md | 1 -
test/behave/features/nextcloud.feature | 2 +-
4 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/ansible/group_vars/all/oas.yml b/ansible/group_vars/all/oas.yml
index cbfe15864..4b1c26551 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 e4b137ae8..8978d9220 100644
--- a/ansible/roles/setup/tasks/helmfiles.yml
+++ b/ansible/roles/setup/tasks/helmfiles.yml
@@ -96,7 +96,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 4388b5027..20b0eed97 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 e255037e5..2482af3ec 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
--
GitLab