From 128a45013c043aba18bec989a4d7ae1a969777c0 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 13 Aug 2021 08:24:51 +1000 Subject: [PATCH] etherpad: remove session key Etherpad startup says: 2021-08-12 16:08:55.872] [WARN] console - Declaring the sessionKey in the settings.json is deprecated. This value is auto-generated now. Please remove the setting from the file. -- If you are seeing this error after restarting using the Admin User Interface then you can ignore this message. So I guess we can remove this. Change-Id: I5a8da8afe8b128224fa1bc89d5ba06fff16ca29b --- playbooks/roles/etherpad/templates/settings.json.j2 | 4 ---- .../zuul/templates/host_vars/etherpad01.opendev.org.yaml.j2 | 2 -- 2 files changed, 6 deletions(-) diff --git a/playbooks/roles/etherpad/templates/settings.json.j2 b/playbooks/roles/etherpad/templates/settings.json.j2 index f645731278..0996f2e0a9 100644 --- a/playbooks/roles/etherpad/templates/settings.json.j2 +++ b/playbooks/roles/etherpad/templates/settings.json.j2 @@ -14,10 +14,6 @@ // favicon default name "favicon": "favicon.ico", - // Session Key, used for reconnecting user sessions - // Set this to a secure string at least 10 characters long. Do not share this value. - "sessionKey" : "{{ etherpad_session_key }}", - //The Type of the database. You can choose between dirty, sqlite and mysql //You should use mysql or sqlite for anything else than testing or development "dbType" : "mysql", diff --git a/playbooks/zuul/templates/host_vars/etherpad01.opendev.org.yaml.j2 b/playbooks/zuul/templates/host_vars/etherpad01.opendev.org.yaml.j2 index c005479c88..6a3443f0b5 100644 --- a/playbooks/zuul/templates/host_vars/etherpad01.opendev.org.yaml.j2 +++ b/playbooks/zuul/templates/host_vars/etherpad01.opendev.org.yaml.j2 @@ -1,4 +1,2 @@ etherpad_db_root_password: rootpassword etherpad_db_password: password -# Must be 14 characters -etherpad_session_key: 'R382T#^XDcNYmg'