[enh] Introduce data and conf hooks category

data/hooks/backup/05-conf_ldap

@@ -1,4 +1,4 @@
-backup_dir="$1/ldap"
+backup_dir="$1/conf/ldap"
 mkdir -p $backup_dir
 
 sudo cp -a /etc/ldap/slapd.conf $backup_dir/

data/hooks/backup/08-conf_ssh

@@ -1,4 +1,4 @@
-backup_dir="$1/ssh"
+backup_dir="$1/conf/ssh"
 mkdir -p $backup_dir
 
 sudo cp -a /etc/ssh/. $backup_dir

data/hooks/backup/11-conf_mysql

@@ -0,0 +1,4 @@
+backup_dir="$1/conf/mysql"
+mkdir -p $backup_dir
+
+mysqlpwd=$(sudo cat /etc/yunohost/mysql)

data/hooks/backup/11-system_mysql

@@ -1,5 +0,0 @@
-backup_dir="$1/mysql"
-mkdir -p $backup_dir
-
-mysqlpwd=$(sudo cat /etc/yunohost/mysql)
-sudo mysqldump -uroot -p"$mysqlpwd" mysql > $backup_dir/mysql.sql

data/hooks/backup/14-conf_ssowat

@@ -1,4 +1,4 @@
-backup_dir="$1/ssowat"
+backup_dir="$1/conf/ssowat"
 mkdir -p $backup_dir
 
 sudo cp -a /etc/ssowat/. $backup_dir

data/hooks/backup/17-data_home

@@ -1,4 +1,4 @@
-backup_dir="$1/home"
+backup_dir="$1/data/home"
 mkdir -p $backup_dir
 
 sudo rsync -a --exclude='/yunohost*' /home/ $backup_dir/

data/hooks/backup/20-conf_ynh_firewall

@@ -0,0 +1,4 @@
+backup_dir="$1/conf/ynh/firewall"
+mkdir -p $backup_dir
+
+sudo cp -a /etc/yunohost/firewall* $backup_dir

data/hooks/backup/20-system_yunohost

@@ -1,4 +0,0 @@
-backup_dir="$1/yunohost"
-mkdir -p $backup_dir
-
-sudo cp -a /etc/yunohost/. $backup_dir

data/hooks/backup/21-conf_ynh_certs

@@ -0,0 +1,4 @@
+backup_dir="$1/conf/ynh/certs"
+mkdir -p $backup_dir
+
+sudo cp -a /etc/yunohost/certs/. $backup_dir

data/hooks/backup/23-data_mail

@@ -1,3 +1,3 @@
-backup_dir="$1/mail"
+backup_dir="$1/data/mail"
 
 sudo cp -a /var/mail/. $backup_dir

data/hooks/backup/26-conf_xmpp

@@ -1,4 +1,4 @@
-backup_dir="$1/xmpp"
+backup_dir="$1/conf/xmpp"
 mkdir -p $backup_dir/{etc,var}
 
 sudo cp -a /etc/metronome/. $backup_dir/etc

data/hooks/backup/29-conf_nginx

@@ -1,4 +1,4 @@
-backup_dir="$1/nginx"
+backup_dir="$1/conf/nginx"
 mkdir -p $backup_dir
 
 sudo cp -a /etc/nginx/conf.d/. $backup_dir

data/hooks/backup/32-conf_cron

@@ -1,4 +1,4 @@
-backup_dir="$1/cron"
+backup_dir="$1/conf/cron"
 mkdir -p $backup_dir
 
 sudo cp -a /etc/cron.d/yunohost* $backup_dir/

data/hooks/restore/05-conf_ldap

@@ -1,4 +1,4 @@
-backup_dir="$1/ldap"
+backup_dir="$1/conf/ldap"
 
 if [ -z "$2" ]; then
 

data/hooks/restore/08-conf_ssh

@@ -1,4 +1,4 @@
-backup_dir="$1/ssh"
+backup_dir="$1/conf/ssh"
 
 sudo cp -a $backup_dir/. /etc/ssh
 sudo service ssh restart

data/hooks/restore/11-conf_mysql

@@ -1,5 +1,5 @@
-backup_dir="$1/mysql"
+backup_dir="$1/conf/mysql"
 
+service mysql restart
 mysqlpwd=$(sudo cat /etc/yunohost/mysql)
-#sudo mysql -uroot -p"$mysqlpwd" mysql < $backup_dir/mysql.sql
 sudo mysqladmin flush-privileges -p"$mysqlpwd"

data/hooks/restore/14-conf_ssowat

@@ -1,3 +1,3 @@
-backup_dir="$1/ssowat"
+backup_dir="$1/conf/ssowat"
 
 sudo cp -a $backup_dir/. /etc/ssowat

data/hooks/restore/17-data_home

@@ -1,3 +1,3 @@
-backup_dir="$1/home"
+backup_dir="$1/data/home"
 
 sudo cp -a $backup_dir/. /home

data/hooks/restore/20-conf_ynh_firewall

@@ -0,0 +1,4 @@
+backup_dir="$1/conf/ynh/firewall"
+
+sudo cp -a $backup_dir/. /etc/yunohost
+sudo yunohost firewall reload

data/hooks/restore/20-system_yunohost

@@ -1,9 +0,0 @@
-backup_dir="$1/yunohost"
-
-sudo cp -a $backup_dir/. /etc/yunohost
-sudo yunohost app ssowatconf
-sudo yunohost firewall reload
-
-# Reload interface name
-sudo rm /etc/yunohost/interface
-sudo apt-get install --reinstall -y yunohost-config-others

data/hooks/restore/21-conf_ynh_certs

@@ -0,0 +1,8 @@
+backup_dir="$1/conf/ynh/certs"
+
+mkdir -p /etc/yunohost/certs/
+
+sudo cp -a $backup_dir/. /etc/yunohost/certs/
+sudo yunohost app ssowatconf
+sudo service nginx reload
+sudo service metronome reload

data/hooks/restore/23-data_mail

@@ -1,4 +1,4 @@
-backup_dir="$1/mail"
+backup_dir="$1/data/mail"
 
 sudo cp -a $backup_dir/. /var/mail
 

data/hooks/restore/26-conf_xmpp

@@ -1,4 +1,4 @@
-backup_dir="$1/xmpp"
+backup_dir="$1/conf/xmpp"
 
 sudo cp -a $backup_dir/etc/. /etc/metronome
 sudo cp -a $backup_dir/var/. /var/lib/metronome

data/hooks/restore/29-conf_nginx

@@ -1,4 +1,4 @@
-backup_dir="$1/nginx"
+backup_dir="$1/conf/nginx"
 
 sudo cp -a $backup_dir/. /etc/nginx/conf.d
 

data/hooks/restore/32-conf_cron

@@ -1,4 +1,4 @@
-backup_dir="$1/cron"
+backup_dir="$1/conf/cron"
 
 sudo cp -a $backup_dir/. /etc/cron.d