From 1d212bebcb490c2db3ec0bd99ef744a5b5e8ad34 Mon Sep 17 00:00:00 2001 From: nemsia Date: Sat, 6 May 2017 22:30:44 +0200 Subject: [PATCH 1/7] [fix] Reinstall dependencies on restore --- scripts/restore | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/scripts/restore b/scripts/restore index 500a9b1..84a3faf 100644 --- a/scripts/restore +++ b/scripts/restore @@ -65,6 +65,36 @@ fi # Create user unix sudo adduser $app --home /opt/$app --gecos "First Last,RoomNumber,WorkPhone,HomePhone" --disabled-password --disabled-login +# Reinstall dependencies + # Install debian package + ynh_package_install imagemagick libpq-dev libxml2-dev libxslt1-dev file curl apt-transport-https + + # Install redis package + ynh_package_install redis-server redis-tools + + # Install postgresql + ynh_package_install postgresql postgresql-contrib + + # 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 ../conf/backports.list /etc/apt/sources.list.d/ + 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 + sudo apt-get -t jessie-backports -y install ffmpeg + + # Install de Node.js + pushd /opt + curl -sL https://deb.nodesource.com/setup_4.x | sudo bash - + sudo apt-get -y install nodejs + + # Install Yarn + ynh_package_install yarn + # Restore sources & data sudo cp -a ./sources/. "$final_path" From 39cde5408c542e5a643b662efcfe58c02d728679 Mon Sep 17 00:00:00 2001 From: nemsia Date: Sat, 6 May 2017 22:48:26 +0200 Subject: [PATCH 2/7] Return to home --- scripts/restore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/restore b/scripts/restore index 84a3faf..d9b7e9e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -95,6 +95,9 @@ sudo adduser $app --home /opt/$app --gecos "First Last,RoomNumber,WorkPhone,Home # Install Yarn ynh_package_install yarn + # Return to home + popd + # Restore sources & data sudo cp -a ./sources/. "$final_path" From 7529cf6210d384cfeb9310e9ca04c8c677ab35ec Mon Sep 17 00:00:00 2001 From: nemsia Date: Sun, 7 May 2017 00:23:22 +0200 Subject: [PATCH 3/7] Check .fonctions --- scripts/remove | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/remove b/scripts/remove index 373d028..1b2c405 100644 --- a/scripts/remove +++ b/scripts/remove @@ -3,6 +3,12 @@ # Exit on command errors and treat unset variables as an error set -u +if [ ! -e .fonctions ]; then + # Get file fonction if not been to the current directory + sudo cp ../settings/scripts/.fonctions ./.fonctions + sudo chmod a+rx .fonctions +fi + source .fonctions # Loads the generic functions usually used in the script # Source app helpers source /usr/share/yunohost/helpers From 941ed7b71c2852f9e4ab0eacc1023c2b9bd0481a Mon Sep 17 00:00:00 2001 From: nemsia Date: Sun, 7 May 2017 00:25:15 +0200 Subject: [PATCH 4/7] Remove unneeded comment --- scripts/restore | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index d9b7e9e..10b4a19 100644 --- a/scripts/restore +++ b/scripts/restore @@ -106,8 +106,6 @@ sudo chown -R $app: "$final_path" sudo ls -alh "$final_path" -# Change directory for create user & database postgresql - # Set UTF8 encoding by default sudo su -c "psql" postgres <<< \ "update pg_database set datistemplate='false' where datname='template1';" From b72fba54be12399bdc5f3438a28864a486a76384 Mon Sep 17 00:00:00 2001 From: nemsia Date: Sun, 7 May 2017 00:29:36 +0200 Subject: [PATCH 5/7] Add apt lists to backup --- scripts/backup | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/backup b/scripts/backup index bb90997..d2a3c69 100644 --- a/scripts/backup +++ b/scripts/backup @@ -29,10 +29,12 @@ ynh_backup "/etc/cron.d/${app}" "cron.conf" ynh_backup "/etc/systemd/system/mastodon-web.service" "systemd_web.service" ynh_backup "/etc/systemd/system/mastodon-sidekiq.service" "systemd_sidekiq.service" ynh_backup "/etc/systemd/system/mastodon-streaming.service" "systemd_streaming.service" +ynh_backup "/etc/apt/sources.list.d/backports.list" "backports.list" +ynh_backup "/etc/apt/sources.list.d/yarn.list" "yarn.list" # Backup db 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 \ No newline at end of file +ynh_secure_remove /var/lib/postgresql/mastodon_db.sql From ade55f6ef2e36846d6bb2e720616f9c08675cde2 Mon Sep 17 00:00:00 2001 From: nemsia Date: Sun, 7 May 2017 00:30:50 +0200 Subject: [PATCH 6/7] Change .list name on backup --- scripts/backup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/backup b/scripts/backup index d2a3c69..cc94aa4 100644 --- a/scripts/backup +++ b/scripts/backup @@ -29,8 +29,8 @@ ynh_backup "/etc/cron.d/${app}" "cron.conf" ynh_backup "/etc/systemd/system/mastodon-web.service" "systemd_web.service" ynh_backup "/etc/systemd/system/mastodon-sidekiq.service" "systemd_sidekiq.service" ynh_backup "/etc/systemd/system/mastodon-streaming.service" "systemd_streaming.service" -ynh_backup "/etc/apt/sources.list.d/backports.list" "backports.list" -ynh_backup "/etc/apt/sources.list.d/yarn.list" "yarn.list" +ynh_backup "/etc/apt/sources.list.d/backports.list" "apt_backports.list" +ynh_backup "/etc/apt/sources.list.d/yarn.list" "apt_yarn.list" # Backup db sudo su - postgres < Date: Sun, 7 May 2017 14:18:57 +0200 Subject: [PATCH 7/7] Copy Apt .lists on restore --- scripts/restore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 10b4a19..f9861ff 100644 --- a/scripts/restore +++ b/scripts/restore @@ -79,9 +79,9 @@ sudo adduser $app --home /opt/$app --gecos "First Last,RoomNumber,WorkPhone,Home 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 ../conf/backports.list /etc/apt/sources.list.d/ + sudo cp ./apt_backports.list /etc/apt/sources.list.d/backports.list sudo curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - - sudo cp ../conf/yarn.list /etc/apt/sources.list.d/ + sudo cp ./apt_yarn.list /etc/apt/sources.list.d/yarn.list ynh_package_update # Install debian package backports