aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scripts/backup4
-rw-r--r--scripts/install2
-rw-r--r--scripts/upgrade4
3 files changed, 3 insertions, 7 deletions
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 <<COMMANDS
pg_dump --role=mastodon -U postgres --no-password mastodon_production > 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 <<COMMANDS
@@ -73,7 +73,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