From 7862b2a64f5712008677fdbc30a93db183851bb6 Mon Sep 17 00:00:00 2001 From: kload Date: Sat, 25 Oct 2014 20:05:04 +0200 Subject: [PATCH] [fix] Typo to avoid listing files --- hooks/backup/05-system_ldap | 2 +- hooks/backup/08-system_ssh | 2 +- hooks/backup/14-system_ssowat | 2 +- hooks/backup/20-system_yunohost | 2 +- hooks/backup/23-system_mail | 3 +-- hooks/backup/26-system_xmpp | 4 ++-- hooks/backup/29-system_nginx | 2 +- hooks/restore/08-system_ssh | 2 +- hooks/restore/14-system_ssowat | 2 +- hooks/restore/17-system_home | 2 +- hooks/restore/20-system_yunohost | 2 +- hooks/restore/23-system_mail | 2 +- hooks/restore/26-system_xmpp | 4 ++-- hooks/restore/29-system_nginx | 2 +- hooks/restore/32-system_cron | 2 +- 15 files changed, 17 insertions(+), 18 deletions(-) diff --git a/hooks/backup/05-system_ldap b/hooks/backup/05-system_ldap index 88d824b6..65c52fc7 100644 --- a/hooks/backup/05-system_ldap +++ b/hooks/backup/05-system_ldap @@ -4,6 +4,6 @@ backup_dir="$1/ldap" mkdir -p $backup_dir sudo cp -a /etc/ldap/slapd.conf $backup_dir/ -slapcat -l $backup_dir/slapcat.ldif.raw +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 diff --git a/hooks/backup/08-system_ssh b/hooks/backup/08-system_ssh index bd5db66a..617eee0f 100644 --- a/hooks/backup/08-system_ssh +++ b/hooks/backup/08-system_ssh @@ -3,4 +3,4 @@ backup_dir="$1/ssh" mkdir -p $backup_dir -sudo cp -a /etc/ssh/* $backup_dir/ +sudo cp -a /etc/ssh/. $backup_dir diff --git a/hooks/backup/14-system_ssowat b/hooks/backup/14-system_ssowat index f642ea24..f4ec8c42 100644 --- a/hooks/backup/14-system_ssowat +++ b/hooks/backup/14-system_ssowat @@ -3,4 +3,4 @@ backup_dir="$1/ssowat" mkdir -p $backup_dir -sudo cp -a /etc/ssowat/* $backup_dir/ +sudo cp -a /etc/ssowat/. $backup_dir diff --git a/hooks/backup/20-system_yunohost b/hooks/backup/20-system_yunohost index 305c82ed..22d556c6 100644 --- a/hooks/backup/20-system_yunohost +++ b/hooks/backup/20-system_yunohost @@ -3,4 +3,4 @@ backup_dir="$1/yunohost" mkdir -p $backup_dir -sudo cp -a /etc/yunohost/* $backup_dir/ +sudo cp -a /etc/yunohost/. $backup_dir diff --git a/hooks/backup/23-system_mail b/hooks/backup/23-system_mail index ad1cf5ae..2145c0bc 100644 --- a/hooks/backup/23-system_mail +++ b/hooks/backup/23-system_mail @@ -1,6 +1,5 @@ #!/bin/bash backup_dir="$1/mail" -mkdir -p $backup_dir -sudo cp -a /var/mail/* $backup_dir/ +sudo cp -a /var/mail/. $backup_dir diff --git a/hooks/backup/26-system_xmpp b/hooks/backup/26-system_xmpp index bfa13819..836c7307 100644 --- a/hooks/backup/26-system_xmpp +++ b/hooks/backup/26-system_xmpp @@ -3,5 +3,5 @@ backup_dir="$1/xmpp" mkdir -p $backup_dir/{etc,var} -sudo cp -a /etc/metronome/* $backup_dir/etc/ -sudo cp -a /var/lib/metronome/* $backup_dir/var/ +sudo cp -a /etc/metronome/. $backup_dir/etc +sudo cp -a /var/lib/metronome/. $backup_dir/var diff --git a/hooks/backup/29-system_nginx b/hooks/backup/29-system_nginx index 9d1bc5b0..6bbcae2c 100644 --- a/hooks/backup/29-system_nginx +++ b/hooks/backup/29-system_nginx @@ -3,4 +3,4 @@ backup_dir="$1/nginx" mkdir -p $backup_dir -sudo cp -a /etc/nginx/conf.d/* $backup_dir/ +sudo cp -a /etc/nginx/conf.d/. $backup_dir diff --git a/hooks/restore/08-system_ssh b/hooks/restore/08-system_ssh index 8f3d3b67..09aaf9c9 100644 --- a/hooks/restore/08-system_ssh +++ b/hooks/restore/08-system_ssh @@ -2,5 +2,5 @@ backup_dir="$1/ssh" -sudo cp -a $backup_dir/* /etc/ssh/ +sudo cp -a $backup_dir/. /etc/ssh sudo service ssh restart diff --git a/hooks/restore/14-system_ssowat b/hooks/restore/14-system_ssowat index 4c00a5ab..df92fe10 100644 --- a/hooks/restore/14-system_ssowat +++ b/hooks/restore/14-system_ssowat @@ -2,4 +2,4 @@ backup_dir="$1/ssowat" -sudo cp -a $backup_dir/* /etc/ssowat/ +sudo cp -a $backup_dir/. /etc/ssowat diff --git a/hooks/restore/17-system_home b/hooks/restore/17-system_home index d097dad0..a90794ad 100644 --- a/hooks/restore/17-system_home +++ b/hooks/restore/17-system_home @@ -2,4 +2,4 @@ backup_dir="$1/home" -sudo cp -a $backup_dir/* /home/ +sudo cp -a $backup_dir/. /home diff --git a/hooks/restore/20-system_yunohost b/hooks/restore/20-system_yunohost index bb23a2dd..1bd33276 100644 --- a/hooks/restore/20-system_yunohost +++ b/hooks/restore/20-system_yunohost @@ -2,7 +2,7 @@ backup_dir="$1/yunohost" -sudo cp -a $backup_dir/* /etc/yunohost/ +sudo cp -a $backup_dir/. /etc/yunohost sudo yunohost app ssowatconf sudo yunohost firewall reload diff --git a/hooks/restore/23-system_mail b/hooks/restore/23-system_mail index 28eafc33..39f6f933 100644 --- a/hooks/restore/23-system_mail +++ b/hooks/restore/23-system_mail @@ -2,7 +2,7 @@ backup_dir="$1/mail" -sudo cp -a $backup_dir/* /var/mail/ +sudo cp -a $backup_dir/. /var/mail # Restart services to use migrated certs sudo service postfix restart diff --git a/hooks/restore/26-system_xmpp b/hooks/restore/26-system_xmpp index c9677f94..c1b4e360 100644 --- a/hooks/restore/26-system_xmpp +++ b/hooks/restore/26-system_xmpp @@ -2,8 +2,8 @@ backup_dir="$1/xmpp" -sudo cp -a $backup_dir/etc/* /etc/metronome/ -sudo cp -a $backup_dir/var/* /var/lib/metronome/ +sudo cp -a $backup_dir/etc/. /etc/metronome +sudo cp -a $backup_dir/var/. /var/lib/metronome # Restart to apply new conf and certs sudo service metronome restart diff --git a/hooks/restore/29-system_nginx b/hooks/restore/29-system_nginx index ca72c76c..62810985 100644 --- a/hooks/restore/29-system_nginx +++ b/hooks/restore/29-system_nginx @@ -2,7 +2,7 @@ backup_dir="$1/nginx" -sudo cp -a $backup_dir/* /etc/nginx/conf.d/ +sudo cp -a $backup_dir/. /etc/nginx/conf.d # Restart to use new conf and certs sudo service nginx restart diff --git a/hooks/restore/32-system_cron b/hooks/restore/32-system_cron index c237157c..b1a53c3d 100644 --- a/hooks/restore/32-system_cron +++ b/hooks/restore/32-system_cron @@ -2,7 +2,7 @@ backup_dir="$1/cron" -sudo cp -a $backup_dir/* /etc/cron.d/ +sudo cp -a $backup_dir/. /etc/cron.d # Restart just in case sudo service cron restart