From 3d3913686526f4495cca6c0234ea06faf46b1bfe Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Sun, 7 May 2017 23:22:41 +0200
Subject: Sync (#11)

* [enh] Switch to tagged release

* [enh] Switch to tagged release on upgrade

* [fix] Restore pg dump

Restore pg dump with mastodon user.

* Change version on manifest

* [fix] Change rm dump to ynh_secure_remove

* [fix] Upgrade from 1.3.3

Fix error: Your local changes to the following files would be overwritten by merge:
        .babelrc
        .dockerignore
        .editorconfig
        .env.production.sample
        .gitignore
        .rubocop.yml
        .travis.yml
        Capfile
        Dockerfile
        README.md
        Vagrantfile
        ....

* [fix] Owner of live

* [fix] Reinstall dependencies on restore

* Return to home

* [fix] Jenkins upgrade error

* Check .fonctions

* Remove unneeded comment

* Add apt lists to backup

* Change .list name on backup

* Copy Apt .lists on restore

* version 1.3.3 on manifest

* Remove admin instructions + TODO
---
 scripts/backup | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts/backup')

diff --git a/scripts/backup b/scripts/backup
index bb90997..cc94aa4 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" "apt_backports.list"
+ynh_backup "/etc/apt/sources.list.d/yarn.list" "apt_yarn.list"
 
 # Backup db
 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"
-ynh_secure_remove /var/lib/postgresql/mastodon_db.sql
\ No newline at end of file
+ynh_secure_remove /var/lib/postgresql/mastodon_db.sql
-- 
cgit v1.2.3-70-g09d2