From c895e8f0cb1505dc66f5ee34b42356eb6f46a3f6 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Thu, 18 Jan 2024 14:16:32 +0100 Subject: [PATCH] further cleaning --- conf/libxxhash.src | 7 ------- manifest.toml | 2 ++ scripts/_common.sh | 9 +-------- scripts/restore | 2 +- 4 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 conf/libxxhash.src diff --git a/conf/libxxhash.src b/conf/libxxhash.src deleted file mode 100644 index 5d4f0c6..0000000 --- a/conf/libxxhash.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.1.tar.gz -SOURCE_SUM=3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true diff --git a/manifest.toml b/manifest.toml index 1c1ad28..a08ad00 100644 --- a/manifest.toml +++ b/manifest.toml @@ -62,6 +62,7 @@ ram.runtime = "3G" ask.fr = "Nom d'utilisateur de votre forge" type = "string" example = "Your username" + default = "username" optional = true [install.forge_token] @@ -69,6 +70,7 @@ ram.runtime = "3G" ask.fr = "Jeton de votre forge (OAuth)" type = "string" example = "A secret token" + default = "thisisanexampletoken" optional = true [resources] diff --git a/scripts/_common.sh b/scripts/_common.sh index bfc9a94..0338ce8 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -40,13 +40,6 @@ set_forge_variables() { # EXPERIMENTAL HELPERS #================================================= -#================================================= -# -# Redis HELPERS -# -# Point of contact : Jean-Baptiste Holcroft -#================================================= - # get the first available redis database # # usage: ynh_redis_get_free_db @@ -70,7 +63,7 @@ ynh_redis_get_free_db() { db=-1 done - test "$db" -eq -1 && ynh_die "No available Redis databases..." + test "$db" -eq -1 && ynh_die --message="No available Redis databases..." echo "$db" } diff --git a/scripts/restore b/scripts/restore index 28759ce..1d3f6b7 100755 --- a/scripts/restore +++ b/scripts/restore @@ -36,7 +36,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE POSTGRESQL DATABASE #================================================= -REMOVEME? ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=5 +ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=5 ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS pg_trgm;" --database=$db_name ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql