From 3d0b3a614e4f0881c5e366ec0ff22c21b56c61f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= Date: Tue, 3 Sep 2013 15:01:55 +0200 Subject: [PATCH 1/7] Adding a loop when dumping routes. Conflicts: zzz_evobackup --- install/etc/evobackup/actions.d/99_system_info | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/install/etc/evobackup/actions.d/99_system_info b/install/etc/evobackup/actions.d/99_system_info index 99aae73..7d98066 100755 --- a/install/etc/evobackup/actions.d/99_system_info +++ b/install/etc/evobackup/actions.d/99_system_info @@ -9,14 +9,10 @@ # interpret the contents differently)" # Get routes -# traceroute -n 8.8.8.8 > /home/backup/traceroute-8.8.8.8 -# mtr -r 8.8.8.8 > /home/backup/mtr-8.8.8.8 -# traceroute -n backup.evolix.net > /home/backup/traceroute-backup.evolix.net -# mtr -r backup.evolix.net > /home/backup/mtr-backup.evolix.net -# traceroute -n www.evolix.fr > /home/backup/traceroute-www.evolix.fr -# mtr -r www.evolix.fr > /home/backup/mtr-www.evolix.fr -# traceroute -n www.evolix.net > /home/backup/traceroute-www.evolix.net -# mtr -r www.evolix.net > /home/backup/mtr-www.evolix.net +for addr in 8.8.8.8 backup.evolix.net www.evolix.fr www.evolix.net; do + mtr -r $addr > /home/backup/mtr-${addr} + traceroute -n $addr > /home/backup/traceroute-${addr} +done # Process list. ps auwwwx > /home/backup/process.txt From f02d4bf238bc8c992e48a6b7eda0d51a57dd6525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= Date: Fri, 15 Nov 2013 12:16:50 +0100 Subject: [PATCH 2/7] Added a way of backuping ElasticSearch Conflicts: zzz_evobackup --- install/etc/evobackup/actions.d/14_elasticsearch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 install/etc/evobackup/actions.d/14_elasticsearch diff --git a/install/etc/evobackup/actions.d/14_elasticsearch b/install/etc/evobackup/actions.d/14_elasticsearch new file mode 100755 index 0000000..c4f0891 --- /dev/null +++ b/install/etc/evobackup/actions.d/14_elasticsearch @@ -0,0 +1,15 @@ +# Dump ElasticSearch +# Disable ES translog flush +curl -s -XPUT 'localhost:9200/_settings' -d '{"index.translog.disable_flush": true}' >/dev/null +# Flushes translog +curl -s 'localhost:9200/_flush' | grep -qe '"ok":true' +# If it succeed, do an rsync of the datadir +if [ $? -eq 0 ]; then + rsync -a /var/lib/elasticsearch /home/backup/ +else + echo "Error when flushing ES translog indexes." +fi +# In any case re-enable translog flush +curl -s -XPUT 'localhost:9200/_settings' -d '{"index.translog.disable_flush": false}' > /dev/null + +exit 0 \ No newline at end of file From d2f9ebc17e40038fbf75bdfced6d7342b75d192c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= Date: Fri, 10 Jan 2014 11:07:05 +0100 Subject: [PATCH 3/7] Added --events for mysqldump. Conflicts: zzz_evobackup --- install/etc/evobackup/actions.d/10_mysql | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/install/etc/evobackup/actions.d/10_mysql b/install/etc/evobackup/actions.d/10_mysql index 2071b1a..aad8572 100755 --- a/install/etc/evobackup/actions.d/10_mysql +++ b/install/etc/evobackup/actions.d/10_mysql @@ -3,26 +3,24 @@ # Dump with all databases in one file. # mysqldump --defaults-extra-file=/etc/mysql/debian.cnf \ -# --opt --all-databases --force | gzip --best > /home/backup/mysql.bak.gz +# --opt --all-databases --force --events | gzip --best > /home/backup/mysql.bak.gz # Dump des BDD en .sql.gz # mkdir -p /home/mysqldump/ -# for i in $(mysql -e 'show databases' -s --skip-column-names | egrep -v -# "^(Database|information_schema)"); do -# mysqldump --force $i | gzip --best > /home/mysqldump/${i}.sql.gz +# for i in $(mysql -e 'show databases' -s --skip-column-names | egrep -v "^(Database|information_schema)"); do +# mysqldump --force --events $i | gzip --best > /home/mysqldump/${i}.sql.gz # done -# for i in $(echo SHOW DATABASES | mysql | egrep -v -# "^(Database|information_schema)" ); \ +# for i in $(echo SHOW DATABASES | mysql | egrep -v "^(Database|information_schema)" ); \ # do mkdir -p /home/mysqldump/$i ; chown -R mysql /home/mysqldump ; \ -# mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -Q --opt -T \ +# mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -Q --opt --events --skip-comments -T \ # /home/mysqldump/$i $i; done # Dump par base # mkdir -p -m 700 /home/mysqldump/BASE # chown -R mysql /home/mysqldump/ # mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -Q \ -# --opt -T /home/mysqldump/BASE BASE +# --opt --events --skip-comments -T /home/mysqldump/BASE BASE # mkdir -p /home/mysqlhotcopy/ # mysqlhotcopy BASE /home/mysqlhotcopy/ @@ -39,8 +37,7 @@ # instance=${instance//port=/} # if [ "$instance" != "3306" ] # then -# mysqldump -P $instance --opt --all-databases -u mysqladmin -# -p$mysqladminpasswd > /home/backup/mysql.$instance.bak +# mysqldump -P $instance --opt --all-databases -u mysqladmin -p$mysqladminpasswd > /home/backup/mysql.$instance.bak # fi #done From 21ed15ed34934622c827a00bb05cc069c71e31ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= Date: Fri, 10 Jan 2014 14:29:05 +0100 Subject: [PATCH 4/7] Exclude database performance_schema for MySQL dumps. Conflicts: zzz_evobackup --- install/etc/evobackup/actions.d/10_mysql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/etc/evobackup/actions.d/10_mysql b/install/etc/evobackup/actions.d/10_mysql index aad8572..3c76d77 100755 --- a/install/etc/evobackup/actions.d/10_mysql +++ b/install/etc/evobackup/actions.d/10_mysql @@ -7,11 +7,11 @@ # Dump des BDD en .sql.gz # mkdir -p /home/mysqldump/ -# for i in $(mysql -e 'show databases' -s --skip-column-names | egrep -v "^(Database|information_schema)"); do +# for i in $(mysql -e 'show databases' -s --skip-column-names | egrep -v "^(Database|information_schema|performance_schema)"); do # mysqldump --force --events $i | gzip --best > /home/mysqldump/${i}.sql.gz # done -# for i in $(echo SHOW DATABASES | mysql | egrep -v "^(Database|information_schema)" ); \ +# for i in $(echo SHOW DATABASES | mysql | egrep -v "^(Database|information_schema|performance_schema)" ); \ # do mkdir -p /home/mysqldump/$i ; chown -R mysql /home/mysqldump ; \ # mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -Q --opt --events --skip-comments -T \ # /home/mysqldump/$i $i; done From 05b28aa8ce6e02f1582b0f3f6738678b5df15e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= Date: Thu, 30 Jan 2014 10:50:40 +0100 Subject: [PATCH 5/7] Better mkdir in chroot-ssh. Conflicts: chroot-ssh.sh --- chroot-new.sh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/chroot-new.sh b/chroot-new.sh index 8c2bc05..ae1b2d8 100755 --- a/chroot-new.sh +++ b/chroot-new.sh @@ -39,18 +39,12 @@ newchroot() { umask 022 # create jail echo -n "1 - Creating the chroot..." - mkdir -p $chrootdir/{bin,dev,etc/ssh,lib,lib64} - mkdir -p $chrootdir/lib/tls/i686/cmov/ - mkdir -p $chrootdir/lib/x86_64-linux-gnu/ - mkdir -p $chrootdir/proc - mkdir -p $chrootdir/root/.ssh - mkdir -p $chrootdir/usr/lib/i686/cmov/ - mkdir -p $chrootdir/lib/i686/cmov/ + mkdir -p $chrootdir/{bin,dev,etc/ssh,lib,lib64,proc} + mkdir -p $chrootdir/lib/{x86_64-linux-gnu,tls/i686/cmov,i686/cmov} mkdir -p $chrootdir/usr/{bin,lib,sbin} - mkdir -p $chrootdir/usr/lib/x86_64-linux-gnu/ - mkdir -p $chrootdir/usr/lib/openssh - mkdir -p $chrootdir/var/log/ - mkdir -p $chrootdir/var/run/sshd + mkdir -p $chrootdir/usr/lib/{x86_64-linux-gnu,openssh,i686/cmov} + mkdir -p $chrootdir/root/.ssh + mkdir -p $chrootdir/var/{log,run/sshd} touch $chrootdir/var/log/{authlog,lastlog,messages,syslog} touch $chrootdir/etc/fstab echo "...OK" From f01c890b20f88bcad8c0cad6538e0d06c055e241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= Date: Thu, 30 Jan 2014 11:50:48 +0100 Subject: [PATCH 6/7] Ameliorate action 99_system_info. --- install/etc/evobackup/actions.d/99_system_info | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install/etc/evobackup/actions.d/99_system_info b/install/etc/evobackup/actions.d/99_system_info index 7d98066..170b0a6 100755 --- a/install/etc/evobackup/actions.d/99_system_info +++ b/install/etc/evobackup/actions.d/99_system_info @@ -1,12 +1,12 @@ #!/bin/sh # Get system informations. +# Dependency: dd, sfdisk, mtr, traceroute, ps, netstat, dpkg # Extract MBR / table partitions. -# dd if=/dev/sda of=/home/backup/MBR bs=512 count=1 2>&1 | egrep -v "(records -# in|records out|512 bytes)" -# sfdisk -d /dev/sda > /home/backup/partitions 2>&1 | egrep -v "(Warning: -#extended partition does not start at a cylinder boundary|DOS and Linux will -# interpret the contents differently)" +dd if=/dev/sda of=/home/backup/MBR bs=512 count=1 2>&1 | \ + egrep -v "(records in|records out|512 bytes)" +sfdisk -d /dev/sda > /home/backup/partitions 2>&1 | \ + egrep -v "(Warning: extended partition does not start at a cylinder boundary|DOS and Linux will interpret the contents differently)" # Get routes for addr in 8.8.8.8 backup.evolix.net www.evolix.fr www.evolix.net; do From 056c847031211705b3a50bd0ff8ec1676bdd38f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= Date: Thu, 30 Jan 2014 11:51:58 +0100 Subject: [PATCH 7/7] Didabled all special actions by default. --- install/etc/evobackup/actions.d/{10_mysql => 10_mysq.disabled} | 0 .../evobackup/actions.d/{11_postgresql => 11_postgresql.disabled} | 0 install/etc/evobackup/actions.d/{12_redis => 12_redis.disabled} | 0 .../etc/evobackup/actions.d/{13_mongodb => 13_mongodb.disabled} | 0 .../actions.d/{14_elasticsearch => 14_elasticsearch.disabled} | 0 install/etc/evobackup/actions.d/{50_ldap => 15_ldap.disabled} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename install/etc/evobackup/actions.d/{10_mysql => 10_mysq.disabled} (100%) rename install/etc/evobackup/actions.d/{11_postgresql => 11_postgresql.disabled} (100%) rename install/etc/evobackup/actions.d/{12_redis => 12_redis.disabled} (100%) rename install/etc/evobackup/actions.d/{13_mongodb => 13_mongodb.disabled} (100%) rename install/etc/evobackup/actions.d/{14_elasticsearch => 14_elasticsearch.disabled} (100%) rename install/etc/evobackup/actions.d/{50_ldap => 15_ldap.disabled} (100%) diff --git a/install/etc/evobackup/actions.d/10_mysql b/install/etc/evobackup/actions.d/10_mysq.disabled similarity index 100% rename from install/etc/evobackup/actions.d/10_mysql rename to install/etc/evobackup/actions.d/10_mysq.disabled diff --git a/install/etc/evobackup/actions.d/11_postgresql b/install/etc/evobackup/actions.d/11_postgresql.disabled similarity index 100% rename from install/etc/evobackup/actions.d/11_postgresql rename to install/etc/evobackup/actions.d/11_postgresql.disabled diff --git a/install/etc/evobackup/actions.d/12_redis b/install/etc/evobackup/actions.d/12_redis.disabled similarity index 100% rename from install/etc/evobackup/actions.d/12_redis rename to install/etc/evobackup/actions.d/12_redis.disabled diff --git a/install/etc/evobackup/actions.d/13_mongodb b/install/etc/evobackup/actions.d/13_mongodb.disabled similarity index 100% rename from install/etc/evobackup/actions.d/13_mongodb rename to install/etc/evobackup/actions.d/13_mongodb.disabled diff --git a/install/etc/evobackup/actions.d/14_elasticsearch b/install/etc/evobackup/actions.d/14_elasticsearch.disabled similarity index 100% rename from install/etc/evobackup/actions.d/14_elasticsearch rename to install/etc/evobackup/actions.d/14_elasticsearch.disabled diff --git a/install/etc/evobackup/actions.d/50_ldap b/install/etc/evobackup/actions.d/15_ldap.disabled similarity index 100% rename from install/etc/evobackup/actions.d/50_ldap rename to install/etc/evobackup/actions.d/15_ldap.disabled