From f01f941513c363b63f9b5d4ffde79de05509de8d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 3 Oct 2021 12:27:47 +0200 Subject: [PATCH 1/6] Update install --- scripts/install | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index f03e6f1..182f4c2 100644 --- a/scripts/install +++ b/scripts/install @@ -84,7 +84,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" ynh_script_progression --message="Creating a PostgreSQL database..." --weight=2 db_name=$(ynh_sanitize_dbid --db_name=$app) -db_user=$db_name +db_user="kemal" ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_psql_test_if_first_run ynh_psql_setup_db --db_user=$db_name --db_name=$db_name @@ -103,10 +103,7 @@ pushd "$final_path" git reset --hard --quiet $version_commit popd -for i in $final_path/config/sql/*.sql ; do - ynh_replace_string --match_string="kemal" --replace_string=$db_user --target_file="$i" ; - ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "$i" ; -done +ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name chmod 750 "$final_path" chmod -R o-rwx "$final_path" From 8f6ee9f24f41e090253203302ecee5f587ceb50d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 3 Oct 2021 12:30:17 +0200 Subject: [PATCH 2/6] Fix --- scripts/install | 4 +++- scripts/remove | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 182f4c2..ca7b256 100644 --- a/scripts/install +++ b/scripts/install @@ -103,7 +103,9 @@ pushd "$final_path" git reset --hard --quiet $version_commit popd -ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name +for i in $final_path/config/sql/*.sql ; do + ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "$i" ; +done chmod 750 "$final_path" chmod -R o-rwx "$final_path" diff --git a/scripts/remove b/scripts/remove index 2382b33..09d89c4 100644 --- a/scripts/remove +++ b/scripts/remove @@ -19,7 +19,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) port=$(ynh_app_setting_get --app=$app --key=port) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name +db_user="kemal" final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= diff --git a/scripts/restore b/scripts/restore index 4b41556..132e45e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -30,7 +30,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name +db_user="kemal" db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 996076f..363305b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,7 +22,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) language=$(ynh_app_setting_get --app=$app --key=language) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name +db_user="kemal" db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) #================================================= From 99c8f0d1660001a7fcb8b0f1c0e4cf93cf5d8583 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 3 Oct 2021 16:30:14 +0200 Subject: [PATCH 3/6] Update config.yml --- conf/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.yml b/conf/config.yml index 7a4191b..a6e20b1 100644 --- a/conf/config.yml +++ b/conf/config.yml @@ -9,7 +9,7 @@ ## This setting is MANDATORY, unless 'database_url' is used. ## db: - user: __DB_NAME__ + user: __DB_USER__ password: __DB_PWD__ host: localhost port: 5432 From a1a131f7c15bc034206dbebb940c9e2fbb32e727 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 3 Oct 2021 16:32:13 +0200 Subject: [PATCH 4/6] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index ca7b256..f228722 100644 --- a/scripts/install +++ b/scripts/install @@ -87,7 +87,7 @@ db_name=$(ynh_sanitize_dbid --db_name=$app) db_user="kemal" ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_psql_test_if_first_run -ynh_psql_setup_db --db_user=$db_name --db_name=$db_name +ynh_psql_setup_db --db_user=$db_user --db_name=$db_name #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE From 383c22719de3d70208d73e005d9c587188d251d1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 3 Oct 2021 23:55:10 +0200 Subject: [PATCH 5/6] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 09c9eec..ca4db2b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -96,7 +96,7 @@ then #git reset --hard --quiet git pull latestVersion=$(git describe --tags --abbrev=0) - git checkout -f $latestVersion #-f + git checkout -f $latestVersion for i in `git rev-list --reverse --abbrev-commit $currentVersion..HEAD` ; do file=./config/migrate-scripts/migrate-db-$i.sh ; [ -f $file ] && $file ; done ynh_exec_warn_less shards update && shards install ynh_exec_warn_less crystal build $final_path/src/invidious.cr --release From c6a124c1d42d64dbcf1718c08b47705a73e22bf7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 4 Oct 2021 00:03:28 +0200 Subject: [PATCH 6/6] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 87aa8cc..da63c8d 100644 --- a/check_process +++ b/check_process @@ -12,7 +12,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=d0b65b69558b6a1a98761eb7be0b34b4ccb7d6b3 + #upgrade=1 from_commit=d0b65b69558b6a1a98761eb7be0b34b4ccb7d6b3 backup_restore=1 multi_instance=0 change_url=0