From 3607272beef9dfd274e2e74cb66b553c3303647c Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Tue, 5 Dec 2023 19:12:12 +0100 Subject: [PATCH] Apply Aleks suggestions + some fixes --- manifest.toml | 7 ++++--- scripts/change_url | 7 ------- scripts/install | 3 +-- scripts/remove | 6 ------ scripts/restore | 2 -- scripts/upgrade | 7 ------- 6 files changed, 5 insertions(+), 27 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2291818..c05f14e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -47,8 +47,8 @@ ram.runtime = "50M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/overleaf/overleaf/archive/b1978d936214d9af10edf9c4d611fb0aa68aab5b.zip" - sha256 = "c906b7bb0750dd0fa1d19f90324a75120f999f09e41a27d2c4fdee724124cf7d" + url = "https://github.com/overleaf/overleaf/archive/a4ca117640c1f18c1b3ca0564576fdbece427ba5.tar.gz" + sha256 = "65ea4861384cf56f0b390cf2f28dbfbb57d623f531a87d4a49b97f19c16023f8" [resources.sources.ldap] @@ -69,7 +69,8 @@ ram.runtime = "50M" main.auth_header = false admin.url = "/launchpad" - admin.allowed = "admins" + admin.allowed = "admins" + admin.show_tile = false [resources.ports] main.default = 8095 diff --git a/scripts/change_url b/scripts/change_url index 083f252..397a720 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,13 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# Load settings -#================================================= -ynh_app_setting_set --app=$app --key=language --value=$language -ynh_app_setting_set --app=$app --key=crypto_random --value=$crypto_random -ynh_app_setting_set --app=$app --key=web_api_password --value=$web_api_password - #================================================= # STANDARD MODIFICATIONS #================================================= diff --git a/scripts/install b/scripts/install index 0da4491..d1ceff8 100755 --- a/scripts/install +++ b/scripts/install @@ -17,7 +17,6 @@ admin_mail=$(ynh_user_get_info --username=$admin --key=mail) # STORE SETTINGS FROM MANIFEST #================================================= -ynh_app_setting_set --app=$app --key=language --value=$language ynh_app_setting_set --app=$app --key=crypto_random --value=$crypto_random ynh_app_setting_set --app=$app --key=web_api_password --value=$web_api_password @@ -143,9 +142,9 @@ popd chmod 750 "$install_dir/live" chmod -R o-rwx "$install_dir/live" chown -R $app:www-data "$install_dir/live" +chown -R $app:www-data "$install_dir/config" mkdir -p "$install_dir/tmp/uploads" - chmod 750 "$install_dir/tmp" chmod -R o-rwx "$install_dir/tmp" chown -R $app:www-data "$install_dir/tmp" diff --git a/scripts/remove b/scripts/remove index 402caf0..ea7b944 100755 --- a/scripts/remove +++ b/scripts/remove @@ -76,12 +76,6 @@ then ynh_script_progression --message="Removing $app-web service integration..." yunohost service remove "$app-web" fi -if ynh_exec_warn_less yunohost service status "$mongod" >/dev/null -then - ynh_script_progression --message="Removing mongod service integration..." - yunohost service remove "mongod" -fi - #================================================= # STOP AND REMOVE SERVICE diff --git a/scripts/restore b/scripts/restore index 357e821..4333b0d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -10,8 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -ynh_app_setting_set --app=$app --key=web_api_password --value=$web_api_password - #================================================= # INSTALL DEPENDENCIES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 2c8bf1a..d5145e7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,13 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# Load settings -#================================================= -ynh_app_setting_set --app=$app --key=language --value=$language -ynh_app_setting_set --app=$app --key=crypto_random --value=$crypto_random -ynh_app_setting_set --app=$app --key=web_api_password --value=$web_api_password - #================================================= # CHECK VERSION #=================================================