diff --git a/data/hooks/backup/05-conf_ldap b/data/hooks/backup/05-conf_ldap index 1e405e69..a0c7b8c0 100644 --- a/data/hooks/backup/05-conf_ldap +++ b/data/hooks/backup/05-conf_ldap @@ -1,5 +1,5 @@ backup_dir="$1/conf/ldap" -mkdir -p $backup_dir +sudo mkdir -p $backup_dir # Fix for first jessie yunohost where slapd.conf is called slapd-yuno.conf # without slapcat doesn't work @@ -11,5 +11,5 @@ fi sudo cp -a /etc/ldap/slapd.conf $backup_dir/ sudo slapcat -l $backup_dir/slapcat.ldif.raw -egrep -v "^entryCSN:" < $backup_dir/slapcat.ldif.raw > $backup_dir/slapcat.ldif -rm -f $backup_dir/slapcat.ldif.raw +sudo bash -c "egrep -v '^entryCSN:' < $backup_dir/slapcat.ldif.raw > $backup_dir/slapcat.ldif" +sudo rm -f $backup_dir/slapcat.ldif.raw diff --git a/data/hooks/backup/08-conf_ssh b/data/hooks/backup/08-conf_ssh index f17ce48e..693dd8cf 100644 --- a/data/hooks/backup/08-conf_ssh +++ b/data/hooks/backup/08-conf_ssh @@ -1,4 +1,8 @@ backup_dir="$1/conf/ssh" -mkdir -p $backup_dir +sudo mkdir -p $backup_dir -sudo cp -a /etc/ssh/. $backup_dir +if [ -d /etc/ssh/ ]; then + sudo cp -a /etc/ssh/. $backup_dir +else + echo "SSH is not installed" +fi diff --git a/data/hooks/backup/11-conf_ynh_mysql b/data/hooks/backup/11-conf_ynh_mysql index e0cdc59a..5789901f 100644 --- a/data/hooks/backup/11-conf_ynh_mysql +++ b/data/hooks/backup/11-conf_ynh_mysql @@ -1,4 +1,4 @@ backup_dir="$1/conf/ynh/mysql" -mkdir -p $backup_dir +sudo mkdir -p $backup_dir sudo cp -a /etc/yunohost/mysql $backup_dir/ diff --git a/data/hooks/backup/14-conf_ssowat b/data/hooks/backup/14-conf_ssowat index bae11546..3b23c264 100644 --- a/data/hooks/backup/14-conf_ssowat +++ b/data/hooks/backup/14-conf_ssowat @@ -1,4 +1,4 @@ backup_dir="$1/conf/ssowat" -mkdir -p $backup_dir +sudo mkdir -p $backup_dir sudo cp -a /etc/ssowat/. $backup_dir diff --git a/data/hooks/backup/17-data_home b/data/hooks/backup/17-data_home index acc999a8..d6faa893 100644 --- a/data/hooks/backup/17-data_home +++ b/data/hooks/backup/17-data_home @@ -1,5 +1,5 @@ backup_dir="$1/data/home" -mkdir -p $backup_dir +sudo mkdir -p $backup_dir . /usr/share/yunohost/apps/helpers diff --git a/data/hooks/backup/20-conf_ynh_firewall b/data/hooks/backup/20-conf_ynh_firewall index cb0a8493..f478e0fd 100644 --- a/data/hooks/backup/20-conf_ynh_firewall +++ b/data/hooks/backup/20-conf_ynh_firewall @@ -1,4 +1,4 @@ backup_dir="$1/conf/ynh/firewall" -mkdir -p $backup_dir +sudo mkdir -p $backup_dir sudo cp -a /etc/yunohost/firewall* $backup_dir diff --git a/data/hooks/backup/21-conf_ynh_certs b/data/hooks/backup/21-conf_ynh_certs index 061513f9..19483ae5 100644 --- a/data/hooks/backup/21-conf_ynh_certs +++ b/data/hooks/backup/21-conf_ynh_certs @@ -1,4 +1,4 @@ backup_dir="$1/conf/ynh/certs" -mkdir -p $backup_dir +sudo mkdir -p $backup_dir sudo cp -a /etc/yunohost/certs/. $backup_dir diff --git a/data/hooks/backup/26-conf_xmpp b/data/hooks/backup/26-conf_xmpp index 68461c03..f207975e 100644 --- a/data/hooks/backup/26-conf_xmpp +++ b/data/hooks/backup/26-conf_xmpp @@ -1,5 +1,5 @@ backup_dir="$1/conf/xmpp" -mkdir -p $backup_dir/{etc,var} +sudo mkdir -p $backup_dir/{etc,var} sudo cp -a /etc/metronome/. $backup_dir/etc sudo cp -a /var/lib/metronome/. $backup_dir/var diff --git a/data/hooks/backup/29-conf_nginx b/data/hooks/backup/29-conf_nginx index caa9c9d5..19bd1b45 100644 --- a/data/hooks/backup/29-conf_nginx +++ b/data/hooks/backup/29-conf_nginx @@ -1,4 +1,4 @@ backup_dir="$1/conf/nginx" -mkdir -p $backup_dir +sudo mkdir -p $backup_dir sudo cp -a /etc/nginx/conf.d/. $backup_dir diff --git a/data/hooks/backup/32-conf_cron b/data/hooks/backup/32-conf_cron index 5052d50e..efa18f34 100644 --- a/data/hooks/backup/32-conf_cron +++ b/data/hooks/backup/32-conf_cron @@ -1,4 +1,4 @@ backup_dir="$1/conf/cron" -mkdir -p $backup_dir +sudo mkdir -p $backup_dir sudo cp -a /etc/cron.d/yunohost* $backup_dir/