From 6c40efb59643e82a99a8097fa1505d45e421229d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 11 Jan 2021 21:51:57 +0100 Subject: [PATCH] fix --- manifest.json | 4 ++++ scripts/install | 22 +++++++++++----------- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/manifest.json b/manifest.json index 68670da..a8fe4c5 100644 --- a/manifest.json +++ b/manifest.json @@ -35,6 +35,10 @@ "en": "Is it a public application?", "fr": "Est-ce une application publique ?" }, + "help": { + "en": "If enabled, Misskey will be accessible by people who do not have an account. This can be changed later via the webadmin.", + "fr": "Si cette case est cochée, Misskey sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + }, "default": true } ] diff --git a/scripts/install b/scripts/install index 64397aa..ef5ab4f 100755 --- a/scripts/install +++ b/scripts/install @@ -55,7 +55,7 @@ ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= # FIND AND OPEN A PORT #================================================= -ynh_script_progression --message="Configuring firewall..." +ynh_script_progression --message="Finding an available port..." # Find an available port port=$(ynh_find_port --port=3020) @@ -101,18 +101,18 @@ ynh_setup_source --dest_dir="$final_path" #================================================= # ADD SWAP IF NEEDED #================================================= -ynh_script_progression --message="Adding swap is needed..." +# ynh_script_progression --message="Adding swap is needed..." -total_memory=$(ynh_get_ram --total) -swap_needed=0 +# total_memory=$(ynh_get_ram --total) +# swap_needed=0 -if [ $total_memory -lt $MEMORY_NEEDED ]; then - # Need a minimum of 2.5Go of memory - swap_needed=$(($MEMORY_NEEDED - $total_memory)) -fi +# if [ $total_memory -lt $MEMORY_NEEDED ]; then +# # Need a minimum of 2.5Go of memory +# swap_needed=$(($MEMORY_NEEDED - $total_memory)) +# fi -ynh_script_progression --message="Adding $swap_needed Mo to swap..." -ynh_add_swap --size=$swap_needed +# ynh_script_progression --message="Adding $swap_needed Mo to swap..." +# ynh_add_swap --size=$swap_needed #================================================= # NGINX CONFIGURATION @@ -149,7 +149,7 @@ ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_f #================================================= # Calculate and store the config file checksum into the app settings -ynh_store_file_checksum --file="$config" +ynh_store_file_checksum --file="$final_path/.config/default.yml" #================================================= # INSTALLING MISKKEY diff --git a/scripts/restore b/scripts/restore index 727741e..951c0a0 100755 --- a/scripts/restore +++ b/scripts/restore @@ -137,7 +137,7 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "A interplanetary blogging platform" --log="/var/log/$app/$app.log" +yunohost service add $app --description="A interplanetary blogging platform" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index eb19f38..ce7dea0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -192,7 +192,7 @@ chown -R $app: $final_path #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "A interplanetary blogging platform" --log="/var/log/$app/$app.log" +yunohost service add $app --description="A interplanetary blogging platform" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE