Merge pull request #46 from YunoHost-Apps/testing

Testing: upgrade to version 1.1.17

README.md

@@ -32,7 +32,7 @@ More about the features can be found here: <https://github.com/gristlabs/grist-c
 - You cannot log out from Grist, you have to log out from YunoHost to do that.
 
 
-**Shipped version:** 1.1.16~ynh1
+**Shipped version:** 1.1.17~ynh2
 
 **Demo:** <https://docs.getgrist.com>
 

README_es.md

@@ -32,7 +32,7 @@ More about the features can be found here: <https://github.com/gristlabs/grist-c
 - You cannot log out from Grist, you have to log out from YunoHost to do that.
 
 
-**Versión actual:** 1.1.16~ynh1
+**Versión actual:** 1.1.17~ynh2
 
 **Demo:** <https://docs.getgrist.com>
 

README_eu.md

@@ -32,7 +32,7 @@ More about the features can be found here: <https://github.com/gristlabs/grist-c
 - You cannot log out from Grist, you have to log out from YunoHost to do that.
 
 
-**Paketatutako bertsioa:** 1.1.16~ynh1
+**Paketatutako bertsioa:** 1.1.17~ynh2
 
 **Demoa:** <https://docs.getgrist.com>
 

README_fr.md

@@ -32,7 +32,7 @@ Plus d'information sur les fonctionnalités sont disponibles ici : <https://gith
 - Vous ne pouvez pas vous déconnecter depuis Grist, pour ce faire, vous devez vous déconnecter de YunoHost.
 
 
-**Version incluse :** 1.1.16~ynh1
+**Version incluse :** 1.1.17~ynh2
 
 **Démo :** <https://docs.getgrist.com>
 

README_gl.md

@@ -32,7 +32,7 @@ More about the features can be found here: <https://github.com/gristlabs/grist-c
 - You cannot log out from Grist, you have to log out from YunoHost to do that.
 
 
-**Versión proporcionada:** 1.1.16~ynh1
+**Versión proporcionada:** 1.1.17~ynh2
 
 **Demo:** <https://docs.getgrist.com>
 

README_id.md

@@ -32,7 +32,7 @@ More about the features can be found here: <https://github.com/gristlabs/grist-c
 - You cannot log out from Grist, you have to log out from YunoHost to do that.
 
 
-**Versi terkirim:** 1.1.16~ynh1
+**Versi terkirim:** 1.1.17~ynh2
 
 **Demo:** <https://docs.getgrist.com>
 

README_zh_Hans.md

@@ -32,7 +32,7 @@ More about the features can be found here: <https://github.com/gristlabs/grist-c
 - You cannot log out from Grist, you have to log out from YunoHost to do that.
 
 
-**分发版本：** 1.1.16~ynh1
+**分发版本：** 1.1.17~ynh2
 
 **演示：** <https://docs.getgrist.com>
 

conf/default.env

@@ -1,7 +1,6 @@
 # This file is not meant to be edited.
 # Please place your environment variables in __DATA_DIR__/custom.env file
 APP_HOME_URL=https://__DOMAIN__
-APP_HOME_INTERNAL_URL=http://localhost:__PORT__
 GRIST_ORG_IN_PATH=true
 GRIST_SANDBOX_FLAVOR=pyodide
 GRIST_HIDE_UI_ELEMENTS=billing,sendToDrive
@@ -11,10 +10,12 @@ REDIS_URL=redis://localhost:6379/__REDIS_DB__
 GRIST_DATA_DIR=__DATA_DIR__/docs/
 TYPEORM_DATABASE=__DATA_DIR__/home.db
 PORT=__PORT__
+GRIST_DEFAULT_EMAIL=__ADMIN_EMAIL__
+GRIST_SESSION_SECRET=__SESSION_SECRET__
 
 # Authentication
 GRIST_FORWARD_AUTH_HEADER=Email
 GRIST_IGNORE_SESSION=0 # SSOWat Removes the authentication headers: https://github.com/YunoHost/SSOwat/blob/38a6f23f3805a098b4ab757ff002f3a5fb3c377a/helpers.lua#L422-L425
 
-# Widget iist
+
 GRIST_WIDGET_LIST_URL=https://github.com/gristlabs/grist-widget/releases/download/latest/manifest.json

manifest.toml

@@ -7,7 +7,7 @@ name = "Grist"
 description.en = "Modern relational spreadsheet"
 description.fr = "Feuille de calcul relationnelle moderne"
 
-version = "1.1.16~ynh1"
+version = "1.1.17~ynh2"
 
 maintainers = ["fflorent"]
 
@@ -56,8 +56,8 @@ ram.runtime = "150M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/gristlabs/grist-core/archive/refs/tags/v1.1.16.tar.gz"
-        sha256 = "6f12ada699f5f14e587b677b6b43adde86c09698718b59332f975e8eddb44ed7"
+        url = "https://github.com/gristlabs/grist-core/archive/refs/tags/v1.1.17.tar.gz"
+        sha256 = "14049bc7cd2ced153fb7c5e547018ae597d7a4010f96e0c7583a0d2e953e0dc0"
 
         autoupdate.strategy = "latest_github_release"
 

scripts/change_url

@@ -32,6 +32,9 @@ ynh_script_progression --message="Updating env configuration file..." --weight=1
 
 domain="$new_domain"
 path="$new_path"
+admin_email=$(ynh_user_get_info --username=$admin --key=mail)
+redis_db=$(ynh_app_setting_get --app=$app --key=redis_db)
+session_secret=$(ynh_app_setting_get --app=$app --key=session_secret)
 ynh_add_config --template="default.env" --destination="$install_dir/default.env"
 
 #=================================================

scripts/install

@@ -9,6 +9,14 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
+
+#=================================================
+# INITIALIZE AND STORE SETTINGS
+#=================================================
+
+session_secret=$(ynh_string_random --length=32)
+ynh_app_setting_set --app=$app --key=session_secret --value=$session_secret
+
 #=================================================
 # APP "BUILD" (DEPLOYING SOURCES, VENV, COMPILING ETC)
 #=================================================
@@ -71,6 +79,7 @@ ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
+admin_email=$(ynh_user_get_info --username=$admin --key=mail)
 ynh_add_config --template="default.env" --destination="$install_dir/default.env"
 ynh_add_config --template="custom.env" --destination="$data_dir/custom.env"
 

scripts/upgrade

@@ -12,7 +12,7 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 redis_db=$(ynh_app_setting_get --app=$app --key=redis_db)
-
+session_secret=$(ynh_app_setting_get --app=$app --key=session_secret)
 
 upgrade_type=$(ynh_check_app_version_changed)
 
@@ -23,6 +23,15 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
 
+#=================================================
+# ENSURE DOWNWARD COMPATIBILITY
+#=================================================
+
+if [ -z "$session_secret" ]; then
+  session_secret=$(ynh_string_random --length=32)
+  ynh_app_setting_set --app=$app --key=session_secret --value=$session_secret
+fi
+
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
@@ -82,14 +91,12 @@ ynh_use_logrotate --non-append
 #=================================================
 ynh_script_progression --message="Updating a configuration file..." --weight=1
 
+admin_email=$(ynh_user_get_info --username=$admin --key=mail)
 ynh_add_config --template="default.env" --destination="$install_dir/default.env"
 
 chmod 400 "$install_dir/default.env"
 chown $app:$app "$install_dir/default.env"
 
-chmod 700 "$data_dir/custom.env"
-chown $app:$app "$data_dir/custom.env"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================

tests.toml

@@ -10,4 +10,4 @@ test_format = 1.0
 
     exclude = ["install.subdir", "install.nourl"]
 
-    test_upgrade_from.c98a6fb2.name = "Upgrade from 1.1.10"
+    test_upgrade_from.9fcb488.name = "Upgrade from 1.1.13"