From 45573a61cdb375205cc51a68e2b89595bf5d3f6a Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Mon, 7 Oct 2019 22:54:13 +0200
Subject: Upgrade to ruby 2.6.5

---
 scripts/restore | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/restore')

diff --git a/scripts/restore b/scripts/restore
index 1d8180d..689f5c2 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -8,7 +8,7 @@
 
 #Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
-source ../settings/scripts/ynh_install_ruby
+source ../settings/scripts/ynh_install_ruby__2
 source ../settings/scripts/ynh_add_extra_apt_repos__3
 source ../settings/scripts/ynh_add_swap
 source ../settings/scripts/ynh_check_ram
@@ -112,8 +112,8 @@ ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ st
 #=================================================
 ynh_script_progression --message="Installing Ruby..." --weight=393
 
-ynh_install_ruby --ruby_version=2.6.1
-/opt/rbenv/versions/2.6.1/bin/gem update --system
+ynh_install_ruby --ruby_version=2.6.5
+/opt/rbenv/versions/2.6.5/bin/gem update --system
 
 #=================================================
 # RESTORE THE POSTGRESQL DATABASE
-- 
cgit v1.2.3-70-g09d2


From 3a9bc3df2eda8d84ec38bc5afecc9c11839834f2 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 8 Oct 2019 01:22:50 +0200
Subject: Fix db_setup

---
 scripts/install | 3 ++-
 scripts/restore | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts/restore')

diff --git a/scripts/install b/scripts/install
index 311ea59..dafdfc8 100644
--- a/scripts/install
+++ b/scripts/install
@@ -96,6 +96,7 @@ ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd
 ynh_psql_test_if_first_run
 ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+ynh_psql_execute_as_root --sql="ALTER USER $db_user CREATEDB;"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -189,7 +190,7 @@ pushd "$final_path/live"
 	sudo -u "$app" env PATH=$PATH /opt/rbenv/versions/2.6.5/bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without development test
 	sudo -u "$app" env PATH=$PATH yarn install --pure-lockfile
 	sudo -u "$app" echo "SAFETY_ASSURED=1">> .env.production
-	sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rails db:migrate --quiet
+	sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rails db:setup --quiet
 	sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rails assets:precompile --quiet
 	sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt
 	sudo -u "$app" env PATH=$PATH RAILS_ENV=production bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > acc.txt
diff --git a/scripts/restore b/scripts/restore
index 689f5c2..5982c94 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -122,6 +122,7 @@ ynh_script_progression --message="Restoring the PostgreSQL database..." --weight
 
 ynh_psql_test_if_first_run
 ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+ynh_psql_execute_as_root --sql="ALTER USER $db_user CREATEDB;"
 ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name"
 
 #=================================================
-- 
cgit v1.2.3-70-g09d2