From 8f88641088a09aa466d6d2de760d9470b3d4d322 Mon Sep 17 00:00:00 2001 From: nemsia Date: Sun, 28 May 2017 17:31:51 +0200 Subject: upgrade from pre-release --- scripts/install | 4 +--- scripts/upgrade | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/install b/scripts/install index 1634c52..ebe4569 100644 --- a/scripts/install +++ b/scripts/install @@ -95,11 +95,9 @@ CLONECOMMANDS # Switch branch to tagged release cd $final_path/live -url=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest | sort -r | head -1 | cut -d\" -f4) -version=$(echo $url | cut -d/ -f8) sudo su - $app < Date: Sat, 1 Jul 2017 17:39:58 +0200 Subject: error on ynh_secure_remove --- scripts/backup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/backup b/scripts/backup index cc94aa4..0b86c43 100644 --- a/scripts/backup +++ b/scripts/backup @@ -37,4 +37,4 @@ sudo su - postgres < mastodon_db.sql COMMANDS ynh_backup "/var/lib/postgresql/${app}_db.sql" "${app}_db.sql" -ynh_secure_remove /var/lib/postgresql/mastodon_db.sql +rm /var/lib/postgresql/mastodon_db.sql -- cgit v1.2.3-70-g09d2 From 061bb38b0081770cb5e70cc8545321f7f5629c25 Mon Sep 17 00:00:00 2001 From: nemsia Date: Sat, 1 Jul 2017 18:18:23 +0200 Subject: error on script --- scripts/backup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/backup b/scripts/backup index 0b86c43..f93da22 100644 --- a/scripts/backup +++ b/scripts/backup @@ -37,4 +37,4 @@ sudo su - postgres < mastodon_db.sql COMMANDS ynh_backup "/var/lib/postgresql/${app}_db.sql" "${app}_db.sql" -rm /var/lib/postgresql/mastodon_db.sql +#rm /var/lib/postgresql/mastodon_db.sql -- cgit v1.2.3-70-g09d2 From 03074519069383688f69ee7f0dc619b067d9917f Mon Sep 17 00:00:00 2001 From: nemsia Date: Mon, 24 Jul 2017 01:15:15 +0200 Subject: Add libicu-dev and libidn11-dev --- scripts/backup | 4 ---- scripts/install | 2 +- scripts/upgrade | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'scripts') diff --git a/scripts/backup b/scripts/backup index 2e26381..e4a5bba 100644 --- a/scripts/backup +++ b/scripts/backup @@ -43,9 +43,5 @@ sudo su - postgres < mastodon_db.sql COMMANDS ynh_backup "/var/lib/postgresql/${app}_db.sql" "${app}_db.sql" -<<<<<<< HEAD -#rm /var/lib/postgresql/mastodon_db.sql -======= # Fix backup fail on yunohost 2.6 #ynh_secure_remove /var/lib/postgresql/mastodon_db.sql ->>>>>>> refs/remotes/YunoHost-Apps/master diff --git a/scripts/install b/scripts/install index f769a8b..f32252f 100644 --- a/scripts/install +++ b/scripts/install @@ -41,7 +41,7 @@ ynh_app_setting_set $app language $language sudo adduser $app --home /opt/$app --gecos "First Last,RoomNumber,WorkPhone,HomePhone" --disabled-password --disabled-login # Install debian package -ynh_package_install imagemagick libpq-dev libxml2-dev libxslt1-dev file curl apt-transport-https pkg-config libprotobuf-dev protobuf-compiler +ynh_package_install imagemagick libpq-dev libxml2-dev libxslt1-dev file curl apt-transport-https pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev # Install redis package ynh_package_install redis-server redis-tools diff --git a/scripts/upgrade b/scripts/upgrade index dae1d8d..99ae13f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,7 +65,7 @@ if [[ $node_version =~ ^v4.*$ ]]; then fi # add additional package for release 1.4 -ynh_package_install pkg-config libprotobuf-dev protobuf-compiler +ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev # Apply Mastodon upgrade sudo su - $app < 1.4.2 migration prepare_for_foreign_keys is needed -RAILS_ENV=production bundle exec rails mastodon:maintenance:prepare_for_foreign_keys +RAILS_ENV=production bundle exec rails mastodon:maintenance:prepare_for_foreign_keys RAILS_ENV=production bundle exec rails assets:clean RAILS_ENV=production bundle exec rails assets:precompile RAILS_ENV=production bundle exec rails db:migrate -- cgit v1.2.3-70-g09d2 From f224a7d13c67fe5a3d29fcec34dcfbf1b798be9f Mon Sep 17 00:00:00 2001 From: nemsia Date: Thu, 10 Aug 2017 18:11:34 +0200 Subject: New method to select pre-release --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/install b/scripts/install index b088eca..28564cf 100644 --- a/scripts/install +++ b/scripts/install @@ -104,7 +104,7 @@ CLONECOMMANDS cd $final_path/live sudo su - $app < Date: Thu, 7 Sep 2017 23:04:29 +0200 Subject: Remove prepare_for_foreign_keys --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/upgrade b/scripts/upgrade index 371593e..11f9966 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,7 +72,7 @@ pushd ~/live bin/bundle install yarn install --pure-lockfile # For 1.4.1 -> 1.4.2 migration prepare_for_foreign_keys is needed -RAILS_ENV=production bundle exec rails mastodon:maintenance:prepare_for_foreign_keys +# RAILS_ENV=production bundle exec rails mastodon:maintenance:prepare_for_foreign_keys RAILS_ENV=production bundle exec rails assets:clean RAILS_ENV=production bundle exec rails assets:precompile RAILS_ENV=production bundle exec rails db:migrate -- cgit v1.2.3-70-g09d2 From 502e75555bd83719746ca5c09fc18ce836cd4cb8 Mon Sep 17 00:00:00 2001 From: nemsia Date: Wed, 11 Oct 2017 18:59:24 +0200 Subject: Upgrade to ruby 2.5.2 for release 2.0 --- scripts/upgrade | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'scripts') diff --git a/scripts/upgrade b/scripts/upgrade index 11f9966..0c818cd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -66,6 +66,23 @@ fi # add additional package for release 1.4 ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev +# Install ruby 2.5.2 for release 2.0 +sudo su - $app < Date: Wed, 11 Oct 2017 21:22:47 +0200 Subject: Fix to 2.4.2 --- scripts/upgrade | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/upgrade b/scripts/upgrade index 0c818cd..0832e99 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -66,19 +66,21 @@ fi # add additional package for release 1.4 ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev -# Install ruby 2.5.2 for release 2.0 +# Install ruby 2.4.2 for release 2.0 sudo su - $app < Date: Wed, 11 Oct 2017 21:26:13 +0200 Subject: Fix rbenv install error --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/upgrade b/scripts/upgrade index 0832e99..7384e42 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,7 +70,7 @@ ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libi sudo su - $app < Date: Wed, 11 Oct 2017 21:30:51 +0200 Subject: Remove duplicated bundle install and yarn install --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/upgrade b/scripts/upgrade index 7384e42..682df3e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -82,14 +82,14 @@ sudo su - $app < 1.4.2 migration prepare_for_foreign_keys is needed # RAILS_ENV=production bundle exec rails mastodon:maintenance:prepare_for_foreign_keys RAILS_ENV=production bundle exec rails assets:clean -- cgit v1.2.3-70-g09d2