[Savannah-cvs] /srv/bzr/administration r261: Backup script fixes

[Sylvain Beucler]

------------------------------------------------------------
revno: 261
committer: Sylvain Beucler <address@hidden>
branch nick: infra
timestamp: Sun 2011-02-13 16:28:10 +0100
message:
  Backup script fixes
modified:
  backup/base.chb
  backup/dl-confidential.sh
  backup/dl.sh

=== modified file 'backup/base.chb'
--- a/backup/base.chb   2011-02-13 14:59:24 +0000
+++ b/backup/base.chb   2011-02-13 15:28:10 +0000
@@ -17,7 +17,6 @@
   # blah
   /home/syncaliases/00_aliases/aliases
   /home/syncaliases/00_aliases/README
-  /home/syncaliases/.ssh/authorized_keys
 
   /etc/aliases
   /etc/cron.daily/backup-bind
@@ -37,6 +36,8 @@
   /etc/savane/.savane.conf.php
   /etc/savane/savane.conf.pl
 
+  --exclude /etc/apache2/sites-available/default
+  --exclude /etc/apache2/sites-available/default-ssl
   /etc/apache2/sites-available/***
   /etc/apache2/conf.d/detect_bot.conf
 
@@ -52,12 +53,15 @@
   /etc/cron.d/cvs2git
   /etc/cron.d/truncate-gitcvs-db-log
 
+  --exclude /etc/apache2/sites-available/default
+  --exclude /etc/apache2/sites-available/default-ssl
   /etc/apache2/sites-available/***
   /etc/apache2/conf.d/detect_bot.conf
   /etc/apache2/conf.d/rlimit
   /etc/apache2/conf.d/status
 
   --exclude /var/www/*/webalizer/*
+  --exclude /var/www/git/cgit/*
   /var/www/bzr/***
   /var/www/cvs/***
   /var/www/git/***
@@ -88,11 +92,14 @@
  
   /etc/mirmon.conf
  
+  --exclude /etc/apache2/sites-available/default
+  --exclude /etc/apache2/sites-available/default-ssl
   /etc/apache2/sites-available/***
   /etc/apache2/conf.d/sv_dotsig
  
   --exclude /var/www/*/webalizer/*
   --exclude /var/www/arch/google*
+  --exclude /var/www/download/mirmon/*
   /var/www/arch/***
   /var/www/download/***
   /var/www/audio-video/***

=== modified file 'backup/dl-confidential.sh'
--- a/backup/dl-confidential.sh 2010-12-19 17:18:51 +0000
+++ b/backup/dl-confidential.sh 2011-02-13 15:28:10 +0000
@@ -6,6 +6,10 @@
   --include '/root/' \
   --include '/root/.ssh/' \
   --include '/root/.ssh/authorized_keys' \
+  --include '/home/' \
+  --include '/home/syncaliases/' \
+  --include '/home/syncaliases/.ssh/' \
+  --include '/home/syncaliases/.ssh/authorized_keys' \
   --include '/root/mirrors-contacts.txt' \
   --exclude '*'
 

=== modified file 'backup/dl.sh'
--- a/backup/dl.sh      2011-02-13 14:59:24 +0000
+++ b/backup/dl.sh      2011-02-13 15:28:10 +0000
@@ -17,8 +17,6 @@
   --include '/home/syncaliases/00_aliases/' \
   --include '/home/syncaliases/00_aliases/aliases' \
   --include '/home/syncaliases/00_aliases/README' \
-  --include '/home/syncaliases/.ssh/' \
-  --include '/home/syncaliases/.ssh/authorized_keys' \
   \
   --include '/etc/' \
   --include '/etc/aliases' \
@@ -54,6 +52,8 @@
   --include '/etc/savane/.savane.conf.php' \
   --include '/etc/savane/savane.conf.pl' \
   \
+  --exclude /etc/apache2/sites-available/default \
+  --exclude /etc/apache2/sites-available/default-ssl \
   --include '/etc/apache2/' \
   --include '/etc/apache2/sites-available/***' \
   --include '/etc/apache2/conf.d/' \
@@ -82,6 +82,8 @@
   --include '/etc/cron.d/cvs2git' \
   --include '/etc/cron.d/truncate-gitcvs-db-log' \
   \
+  --exclude /etc/apache2/sites-available/default \
+  --exclude /etc/apache2/sites-available/default-ssl \
   --include '/etc/apache2/' \
   --include '/etc/apache2/sites-available/***' \
   --include '/etc/apache2/conf.d/' \
@@ -90,6 +92,7 @@
   --include '/etc/apache2/conf.d/status' \
   \
   --exclude /var/www/*/webalizer/* \
+  --exclude /var/www/git/cgit/* \
   --include '/var/' \
   --include '/var/www/' \
   --include '/var/www/bzr/***' \
@@ -132,6 +135,8 @@
   \
   --include '/etc/mirmon.conf' \
   \
+  --exclude /etc/apache2/sites-available/default \
+  --exclude /etc/apache2/sites-available/default-ssl \
   --include '/etc/apache2/' \
   --include '/etc/apache2/sites-available/***' \
   --include '/etc/apache2/conf.d/' \
@@ -139,6 +144,7 @@
   \
   --exclude /var/www/*/webalizer/* \
   --exclude /var/www/arch/google* \
+  --exclude /var/www/download/mirmon/* \
   --include '/var/' \
   --include '/var/www/' \
   --include '/var/www/arch/***' \