Merge branch 'dev'

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"

install/etc/evobackup/actions.d/10_mysq.disabled

@@ -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|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 -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
 

install/etc/evobackup/actions.d/14_elasticsearch.disabled

@@ -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

install/etc/evobackup/actions.d/99_system_info

@@ -1,22 +1,18 @@
 #!/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
-# 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