diff --git a/scripts/backup b/scripts/backup index e4a5bba..333f6c5 100644 --- a/scripts/backup +++ b/scripts/backup @@ -43,5 +43,3 @@ sudo su - postgres < mastodon_db.sql COMMANDS ynh_backup "/var/lib/postgresql/${app}_db.sql" "${app}_db.sql" -# Fix backup fail on yunohost 2.6 -#ynh_secure_remove /var/lib/postgresql/mastodon_db.sql diff --git a/scripts/install b/scripts/install index 3d5172f..b309e20 100644 --- a/scripts/install +++ b/scripts/install @@ -47,7 +47,7 @@ ynh_package_install imagemagick libpq-dev libxml2-dev libxslt1-dev file curl apt ynh_package_install redis-server redis-tools # Install postgresql -ynh_package_install postgresql postgresql-contrib postgresql-server-dev-9.4 +ynh_package_install postgresql postgresql-contrib postgresql-server-dev-all # Install Ruby ynh_package_install autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm3 libgdbm-dev @@ -59,14 +59,23 @@ if [[ $arch = arm* ]]; then sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7638D0442B90D010 fi -# Install source.list debian package backports & yarn -sudo cp ../conf/backports.list /etc/apt/sources.list.d/ +# Install source.list debian yarn package sudo curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - sudo cp ../conf/yarn.list /etc/apt/sources.list.d/ -ynh_package_update -# Install debian package backports +# Install source.list debian jessie package backports +debian_version=$(lsb_release -c -s) +if [[ $debian_version = jessie ]]; then +sudo cp ../conf/backports.list /etc/apt/sources.list.d/ +ynh_package_update sudo apt-get -t jessie-backports -y install ffmpeg +else +ynh_package_update +ynh_package_install ffmpeg +fi + +# Install Yarn +ynh_package_install yarn # Creates the destination directory and stores its location. ynh_app_setting_set $app final_path $final_path @@ -76,9 +85,6 @@ pushd /opt curl -sL https://deb.nodesource.com/setup_6.x | sudo bash - sudo apt-get -y install nodejs -# Install Yarn -ynh_package_install yarn - # Set UTF8 encoding by default sudo su -c "psql" postgres <<< \ "update pg_database set datistemplate='false' where datname='template1';" diff --git a/scripts/remove b/scripts/remove index 1b2c405..4876f7d 100644 --- a/scripts/remove +++ b/scripts/remove @@ -69,13 +69,10 @@ ynh_psql_drop_db "${app}_production" ynh_psql_drop_role "${app}" # Remove Debian package -sudo apt-get remove --purge -y yarn +#sudo apt-get remove --purge -y yarn #sudo apt-get remove --purge -y imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file curl git -# Delete redis package #sudo apt-get remove --purge -y redis-server redis-tools -# Delete postgresql package #sudo apt-get remove --purge -y postgresql postgresql-contrib -# Delete Ruby package #sudo apt-get remove --purge -y autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm3 libgdbm-dev # Delete app directory and configurations @@ -89,10 +86,10 @@ REMOVE_NGINX_CONF ynh_secure_remove /etc/cron.d/$app # Delete source.list ynh_secure_remove /etc/apt/sources.list.d/backports.list -ynh_secure_remove /etc/apt/sources.list.d/yarn.list +#ynh_secure_remove /etc/apt/sources.list.d/yarn.list # Delete ruby exec -ynh_secure_remove /usr/bin/ruby +#ynh_secure_remove /usr/bin/ruby # Remove user sudo userdel -f $app diff --git a/scripts/restore b/scripts/restore index 30666df..5ab28bb 100644 --- a/scripts/restore +++ b/scripts/restore @@ -67,35 +67,46 @@ sudo adduser $app --home /opt/$app --gecos "First Last,RoomNumber,WorkPhone,Home # Reinstall dependencies # 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 # Install postgresql - ynh_package_install postgresql postgresql-contrib + ynh_package_install postgresql postgresql-contrib postgresql-server-dev-all # Install Ruby ynh_package_install autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm3 libgdbm-dev - # Install source.list debian package backports & yarn - sudo cp ./apt_backports.list /etc/apt/sources.list.d/backports.list + # Import debian archive pubkey, need on ARM arch + arch=$(uname -m) + if [[ $arch = arm* ]]; then + sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8B48AD6246925553 + sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7638D0442B90D010 + fi + + # Install source.list debian yarn package sudo curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - sudo cp ./apt_yarn.list /etc/apt/sources.list.d/yarn.list - ynh_package_update - # Install debian package backports + # Install source.list debian jessie package backports + debian_version=$(lsb_release -c -s) + if [[ $debian_version = jessie ]]; then + sudo cp ./apt_backports.list /etc/apt/sources.list.d/backports.list + ynh_package_update sudo apt-get -t jessie-backports -y install ffmpeg + else + ynh_package_update + ynh_package_install ffmpeg + fi + + # Install Yarn + ynh_package_install yarn # Install de Node.js pushd /opt curl -sL https://deb.nodesource.com/setup_6.x | sudo bash - sudo apt-get -y install nodejs - - # Install Yarn - ynh_package_install yarn - - # Return to home popd # Restore sources & data @@ -107,6 +118,9 @@ sudo chown -R $app: "$final_path" # Debug sudo ls -alh "$final_path" +# Restart postgresql +sudo systemctl restart postgresql + # Set UTF8 encoding by default sudo su -c "psql" postgres <<< \ "update pg_database set datistemplate='false' where datname='template1';" @@ -149,18 +163,21 @@ RECOMMANDS # Remove dump ynh_secure_remove $final_path/mastodon_db.sql -# Create symlink for ruby -sudo ln -s /opt/mastodon/.rbenv/versions/2.4.1/bin/ruby /usr/bin/ruby || true +# Create symlink for ruby 2.5.1 +sudo rm /usr/bin/ruby || true +sudo ln -s /opt/mastodon/.rbenv/versions/2.5.1/bin/ruby /usr/bin/ruby || true -# Upgrade Mastodon -sudo su - $app <