From 452b42c106f9e67f84165e1f62ba7cc516240351 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 4 Jul 2021 08:50:28 +0200 Subject: [PATCH] Upgrade to version 1.8.14 --- conf/app.src | 4 ++-- conf/settings.json | 25 +++++++++++++++++++++++++ manifest.json | 2 +- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 2c28073..3df6ff5 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.13.tar.gz -SOURCE_SUM=c83052daf3b0af8aa3c19a8308e21fcbcfecca99aeb3e8047383875f855443f1 +SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.14.tar.gz +SOURCE_SUM=5404035675fb5ee9349d42927895bb3933590823612ebe31ca4cc523afdac49e SOURCE_SUM_PRG=sha256sum ARCH_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/settings.json b/conf/settings.json index 6a8c1b6..cdff7e4 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -15,6 +15,31 @@ * * This is useful, for example, when running in a Docker container. * + * DETAILED RULES: + * - If the environment variable is set to the string "true" or "false", the + * value becomes Boolean true or false. + * - If the environment variable is set to the string "null", the value + * becomes null. + * - If the environment variable is set to the string "undefined", the setting + * is removed entirely, except when used as the member of an array in which + * case it becomes null. + * - If the environment variable is set to a string representation of a finite + * number, the string is converted to that number. + * - If the environment variable is set to any other string, including the + * empty string, the value is that string. + * - If the environment variable is unset and a default value is provided, the + * value is as if the environment variable was set to the provided default: + * - "${UNSET_VAR:}" becomes the empty string. + * - "${UNSET_VAR:foo}" becomes the string "foo". + * - "${UNSET_VAR:true}" and "${UNSET_VAR:false}" become true and false. + * - "${UNSET_VAR:null}" becomes null. + * - "${UNSET_VAR:undefined}" causes the setting to be removed (or be set + * to null, if used as a member of an array). + * - If the environment variable is unset and no default value is provided, + * the value becomes null. THIS BEHAVIOR MAY CHANGE IN A FUTURE VERSION OF + * ETHERPAD; if you want the default value to be null, you should explicitly + * specify "null" as the default value. + * * EXAMPLE: * "port": "${PORT:9001}" * "minify": "${MINIFY}" diff --git a/manifest.json b/manifest.json index 62110df..2690546 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online editor providing collaborative editing in real-time.", "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel." }, - "version": "1.8.13~ynh2", + "version": "1.8.14~ynh1", "url": "https://framapad.org", "upstream": { "license": "Apache-2.0",