From 0b9049b568d9e699e2d74a07b6c18ac43999b528 Mon Sep 17 00:00:00 2001
From: Gregory Colpart <gcolpart+git@evolix.fr>
Date: Thu, 8 Feb 2018 01:44:14 +0100
Subject: [PATCH 01/23] Improve mysqldump in zzz_evobackup (thanks Bruno for
 the idea)

---
 zzz_evobackup | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zzz_evobackup b/zzz_evobackup
index be4070f..59c5157 100755
--- a/zzz_evobackup
+++ b/zzz_evobackup
@@ -55,14 +55,14 @@ mkdir -p -m 700 /home/backup
 
 ## example with global and compressed mysqldump
 # mysqldump --defaults-extra-file=/etc/mysql/debian.cnf -P 3306 \
-# --opt --all-databases --force --events --hex-blob | gzip --best > /home/backup/mysql.bak.gz
+#  --opt --all-databases --force --events --hex-blob | gzip --best > /home/backup/mysql.bak.gz
 
 ## example with two dumps for each table (.sql/.txt) for all databases
 # for i in $(echo SHOW DATABASES | mysql --defaults-extra-file=/etc/mysql/debian.cnf -P 3306 \
 # | egrep -v "^(Database|information_schema|performance_schema)" ); \
 # do mkdir -p /home/mysqldump/$i ; chown -RL mysql /home/mysqldump ; \
-# mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -P 3306 -Q --opt --events --hex-blob --skip-comments -T \
-# /home/mysqldump/$i $i; done
+# mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -P 3306 -Q --opt --events --hex-blob --skip-comments \
+#  --fields-enclosed-by='\"' --fields-terminated-by=',' -T /home/mysqldump/$i $i; done
 
 ## example with compressed SQL dump for each databases
 # mkdir -p /home/mysqldump/

From b30e0ef7756d2cf501d6a4816ea4c40fb38a2a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= <bserie@evolix.fr>
Date: Tue, 13 Feb 2018 11:57:29 +0100
Subject: [PATCH 02/23] Remove mongodump backup dir before dumping

This is mandatory, elsewhere you'll retain old DBs/collections dumped.
---
 zzz_evobackup | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zzz_evobackup b/zzz_evobackup
index 59c5157..ab99514 100755
--- a/zzz_evobackup
+++ b/zzz_evobackup
@@ -111,6 +111,8 @@ mkdir -p -m 700 /home/backup
 ## don't forget to create use with read-only access
 ## > use admin
 ## > db.createUser( { user: "mongobackup", pwd: "PASS", roles: [ "backup", ] } )
+# test -d /home/backup/mongodump/ && rm -rf /home/backup/mongodump/
+# mkdir -p /home/backup/mongodump/
 # mongodump --quiet -u mongobackup -pPASS -o /home/backup/mongodump/
 # if [ $? -ne 0 ]; then
 #   echo "Error with mongodump!"

From e32c8c31ac66f925cea2e1476b1abc99bc3afeb2 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Mon, 5 Mar 2018 14:15:23 +0100
Subject: [PATCH 03/23] Add a Vagrantfile for test with Vagrant

---
 .gitignore  |  1 +
 Vagrantfile | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 Vagrantfile

diff --git a/.gitignore b/.gitignore
index 1377554..9183973 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.swp
+.vagrant
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000..b0f80b8
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,70 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com')
+
+# Load ~/.VagrantFile if exist, permit local config provider
+vagrantfile = File.join("#{Dir.home}", '.VagrantFile')
+load File.expand_path(vagrantfile) if File.exists?(vagrantfile)
+
+Vagrant.configure('2') do |config|
+  config.vm.synced_folder "./vagrant_share/", "/vagrant", disabled: true
+
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.storage :file, :size => '10G', :device => 'vdb'
+  end
+
+  config.vm.define :jessie do |node|
+    node.vm.hostname = "bkctld-jessie"
+    node.vm.box = "debian/jessie64"
+  end
+
+  config.vm.define :stretch do |node|
+    node.vm.hostname = "bkctld-stretch"
+    node.vm.box = "debian/stretch64"
+  end
+
+  config.vm.provision "copy", type: "file" do |f|
+    f.source = "./"
+    f.destination = "~/bkctld/"
+   end
+
+  config.vm.provision "deps", type: "shell" do |s|
+    s.inline = "DEBIAN_FRONTEND=noninteractive apt-get -yq install openssh-server btrfs-tools rsync lsb-base coreutils sed dash mount openssh-sftp-server libc6 bash-completion"
+  end
+
+  $install = <<SCRIPT
+ln -fs /home/vagrant/bkctld/bkctld /usr/sbin/bkctld
+ln -fs /home/vagrant/bkctld/tpl /usr/share/bkctld
+ln -fs /home/vagrant/bkctld/bash_completion /usr/share/bash-completion/completions/bkctld
+ln -fs /home/vagrant/bkctld/bkctld.conf /etc/default/bkctld
+SCRIPT
+
+  config.vm.provision "install", type: "shell" do |s|
+    s.inline = $install
+  end
+
+  $part = <<SCRIPT
+lsof|awk '/backup/ { print $2 }'| xargs --no-run-if-empty kill -9
+grep -q /backup /proc/mounts && umount -R /backup
+mkfs.btrfs -f /dev/vdb
+mkdir -p /backup
+mount /dev/vdb /backup
+SCRIPT
+
+  config.vm.provision "part", type: "shell" do |s|
+    s.inline = $part
+  end
+
+  $bkctld = <<SCRIPT
+rm -f /root/bkctld.key* && ssh-keygen -t rsa -N "" -f /root/bkctld.key -q
+bkctld init test
+bkctld key test /root/bkctld.key.pub
+bkctld start test
+ssh -p 2223 -i /root/bkctld.key -oStrictHostKeyChecking=no root@127.0.0.1 lastlog -u root
+SCRIPT
+
+  config.vm.provision "bkctld", type: "shell" do |s|
+    s.inline = $bkctld
+  end
+end

From 72993de1c21e4fba7d52c06034d462905cbaba03 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Mon, 5 Mar 2018 15:29:08 +0100
Subject: [PATCH 04/23] Use bats for unit test with Vagrant

---
 Vagrantfile    | 51 +++++++++++++++++++++++---------------------------
 test/main.bats | 22 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 28 deletions(-)
 create mode 100755 test/main.bats

diff --git a/Vagrantfile b/Vagrantfile
index b0f80b8..be687fe 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -14,14 +14,37 @@ Vagrant.configure('2') do |config|
     libvirt.storage :file, :size => '10G', :device => 'vdb'
   end
 
+  $deps = <<SCRIPT
+DEBIAN_FRONTEND=noninteractive apt-get -yq install openssh-server btrfs-tools rsync lsb-base coreutils sed dash mount openssh-sftp-server libc6 bash-completion
+SCRIPT
+
+  $part = <<SCRIPT
+lsof|awk '/backup/ { print $2 }'| xargs --no-run-if-empty kill -9
+grep -q /backup /proc/mounts && umount -R /backup
+mkfs.btrfs -f /dev/vdb
+mkdir -p /backup
+mount /dev/vdb /backup
+SCRIPT
+
   config.vm.define :jessie do |node|
     node.vm.hostname = "bkctld-jessie"
     node.vm.box = "debian/jessie64"
+    config.vm.provision "backports", type: "shell" do |s|
+      s.inline = "echo 'deb http://deb.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list && apt-get update"
+    end
+    config.vm.provision "deps", type: "shell", :inline => $deps
+    config.vm.provision "bats", type: "shell", :inline => "DEBIAN_FRONTEND=noninteractive apt-get -yq install -t jessie-backports bats"
+    config.vm.provision "part", type: "shell", :inline => $part
+    config.vm.provision "test", type: "shell", :path => "./test/main.bats"
   end
 
   config.vm.define :stretch do |node|
     node.vm.hostname = "bkctld-stretch"
     node.vm.box = "debian/stretch64"
+    config.vm.provision "deps", type: "shell", :inline => $deps
+    config.vm.provision "bats", type: "shell", :inline => "DEBIAN_FRONTEND=noninteractive apt-get -yq install bats"
+    config.vm.provision "part", type: "shell", :inline => $part
+    config.vm.provision "test", type: "shell", :path => "./test/main.bats"
   end
 
   config.vm.provision "copy", type: "file" do |f|
@@ -29,10 +52,6 @@ Vagrant.configure('2') do |config|
     f.destination = "~/bkctld/"
    end
 
-  config.vm.provision "deps", type: "shell" do |s|
-    s.inline = "DEBIAN_FRONTEND=noninteractive apt-get -yq install openssh-server btrfs-tools rsync lsb-base coreutils sed dash mount openssh-sftp-server libc6 bash-completion"
-  end
-
   $install = <<SCRIPT
 ln -fs /home/vagrant/bkctld/bkctld /usr/sbin/bkctld
 ln -fs /home/vagrant/bkctld/tpl /usr/share/bkctld
@@ -43,28 +62,4 @@ SCRIPT
   config.vm.provision "install", type: "shell" do |s|
     s.inline = $install
   end
-
-  $part = <<SCRIPT
-lsof|awk '/backup/ { print $2 }'| xargs --no-run-if-empty kill -9
-grep -q /backup /proc/mounts && umount -R /backup
-mkfs.btrfs -f /dev/vdb
-mkdir -p /backup
-mount /dev/vdb /backup
-SCRIPT
-
-  config.vm.provision "part", type: "shell" do |s|
-    s.inline = $part
-  end
-
-  $bkctld = <<SCRIPT
-rm -f /root/bkctld.key* && ssh-keygen -t rsa -N "" -f /root/bkctld.key -q
-bkctld init test
-bkctld key test /root/bkctld.key.pub
-bkctld start test
-ssh -p 2223 -i /root/bkctld.key -oStrictHostKeyChecking=no root@127.0.0.1 lastlog -u root
-SCRIPT
-
-  config.vm.provision "bkctld", type: "shell" do |s|
-    s.inline = $bkctld
-  end
 end
diff --git a/test/main.bats b/test/main.bats
new file mode 100755
index 0000000..3023333
--- /dev/null
+++ b/test/main.bats
@@ -0,0 +1,22 @@
+#!/usr/bin/env bats
+
+setup() {
+    rm -f /root/bkctld.key* && ssh-keygen -t rsa -N "" -f /root/bkctld.key -q
+    bkctld init test
+    bkctld key test /root/bkctld.key.pub
+    bkctld start test
+}
+
+teardown() {
+    bkctld remove test
+}
+
+@test "simple ssh" {
+    ssh -p 2223 -i /root/bkctld.key -oStrictHostKeyChecking=no root@127.0.0.1 lastlog -u root
+    [ "$?" -eq 0 ]
+}
+
+@test "rsync" {
+    rsync -a -e "ssh -p 2223 -i /root/bkctld.key -oStrictHostKeyChecking=no" /tmp/ root@127.0.0.1:/var/backup/
+    [ "$?" -eq 0 ]
+}

From 506b1e94f9ae72611b4ad2d46dc462627128618d Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Mon, 5 Mar 2018 15:43:36 +0100
Subject: [PATCH 05/23] Use run command for bats test

---
 test/main.bats | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/main.bats b/test/main.bats
index 3023333..0f591cc 100755
--- a/test/main.bats
+++ b/test/main.bats
@@ -12,11 +12,11 @@ teardown() {
 }
 
 @test "simple ssh" {
-    ssh -p 2223 -i /root/bkctld.key -oStrictHostKeyChecking=no root@127.0.0.1 lastlog -u root
-    [ "$?" -eq 0 ]
+    run ssh -p 2223 -i /root/bkctld.key -oStrictHostKeyChecking=no root@127.0.0.1 lastlog -u root
+    [ "$status" -eq 0 ]
 }
 
 @test "rsync" {
-    rsync -a -e "ssh -p 2223 -i /root/bkctld.key -oStrictHostKeyChecking=no" /tmp/ root@127.0.0.1:/var/backup/
-    [ "$?" -eq 0 ]
+    run rsync -a -e "ssh -p 2223 -i /root/bkctld.key -oStrictHostKeyChecking=no" /tmp/ root@127.0.0.1:/var/backup/
+    [ "$status" -eq 0 ]
 }

From 8bfa8e18dda1b5dbd5adb3523d0dff870ed0fce9 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Mon, 5 Mar 2018 16:15:35 +0100
Subject: [PATCH 06/23] Add basics tests with bats

---
 test/main.bats | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/test/main.bats b/test/main.bats
index 0f591cc..1507615 100755
--- a/test/main.bats
+++ b/test/main.bats
@@ -1,22 +1,48 @@
 #!/usr/bin/env bats
 
 setup() {
+    port=$(awk -v min=2222 -v max=2999 'BEGIN{srand(); print int(min+rand()*(max-min+1))}')
     rm -f /root/bkctld.key* && ssh-keygen -t rsa -N "" -f /root/bkctld.key -q
     bkctld init test
+    bkctld port test "${port}"
     bkctld key test /root/bkctld.key.pub
     bkctld start test
+    bpid=$(cat /backup/jails/test/run/sshd.pid)
+    bkctld restart test
+    apid=$(cat /backup/jails/test/run/sshd.pid)
+    bkctld inc
 }
 
 teardown() {
     bkctld remove test
 }
 
-@test "simple ssh" {
-    run ssh -p 2223 -i /root/bkctld.key -oStrictHostKeyChecking=no root@127.0.0.1 lastlog -u root
+@test "port" {
+    run nc -vz 127.0.0.1 "${port}"
+    [ "$status" -eq 0 ]
+}
+
+@test "key" {
+    run cat /backup/jails/test/root/.ssh/authorized_keys
+    [ "$status" -eq 0 ]
+    [ "$output" = $(cat /root/bkctld.key.pub) ]
+}
+
+@test "ssh" {
+    run ssh -p "${port}" -i /root/bkctld.key -oStrictHostKeyChecking=no root@127.0.0.1 ls
     [ "$status" -eq 0 ]
 }
 
 @test "rsync" {
-    run rsync -a -e "ssh -p 2223 -i /root/bkctld.key -oStrictHostKeyChecking=no" /tmp/ root@127.0.0.1:/var/backup/
+    run rsync -a -e "ssh -p ${port} -i /root/bkctld.key -oStrictHostKeyChecking=no" /tmp/ root@127.0.0.1:/var/backup/
+    [ "$status" -eq 0 ]
+}
+
+@test "restart" {
+    [ "${bpid}" -ne "${apid}" ]
+}
+
+@test "inc" {
+    run ls /backup/incs/test/*
     [ "$status" -eq 0 ]
 }

From afc33a400265dbf8bc5c3e6c8489a402ddb7ebc3 Mon Sep 17 00:00:00 2001
From: Alexis Ben Miloud--Josselin <abenmiloud+git@evolix.fr>
Date: Fri, 9 Mar 2018 10:39:59 +0100
Subject: [PATCH 07/23] Update elasticsearch snapshot

---
 zzz_evobackup | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/zzz_evobackup b/zzz_evobackup
index ab99514..5cbfc97 100755
--- a/zzz_evobackup
+++ b/zzz_evobackup
@@ -122,13 +122,20 @@ mkdir -p -m 700 /home/backup
 # cp /var/lib/redis/dump.rdb /home/backup/
 
 ## ElasticSearch : example with rsync (warning: don't forget to use NFS if you have a cluster)
+# DATE=$(date +%F)
 ## 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
+## Flushes translog and check if snapshot has not already been made today
+# curl -s 'localhost:9200/_flush' | grep -qe '"ok":true' &&
+# curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/snapshot_${DATE}" | grep -qv 404
+## If it succeed, do a snapshot and remove old ones
 # if [ $? -eq 0 ]; then
-#     rsync -a /var/lib/elasticsearch /home/backup/
+#     curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot_${DATE}?wait_for_completion=true" -o /tmp/es_snapshot_${DATE}.log
+#     cd /home/backup-elasticsearch/snaprepo
+#     for i in $(curl -s -XGET "localhost:9200/_snapshot/snaprepo/_all?pretty=true" | grep '^ *"snapshot" : "snapshot_.*",$' | cut -d_ -f2 | sed 's/",$//' | head -n-10); do
+#         curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/snapshot_${i}"
+#     done
+#     cd -
 # else
 #     echo "Error when flushing ES translog indexes."
 # fi

From 135c1df22af50ee04696507f6eb25760d77e39c0 Mon Sep 17 00:00:00 2001
From: Alexis Ben Miloud--Josselin <abenmiloud+git@evolix.fr>
Date: Wed, 14 Mar 2018 14:49:25 +0100
Subject: [PATCH 08/23] Remove unneeded lines

---
 zzz_evobackup | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/zzz_evobackup b/zzz_evobackup
index 5cbfc97..09ec4ea 100755
--- a/zzz_evobackup
+++ b/zzz_evobackup
@@ -123,24 +123,11 @@ mkdir -p -m 700 /home/backup
 
 ## ElasticSearch : example with rsync (warning: don't forget to use NFS if you have a cluster)
 # DATE=$(date +%F)
-## Disable ES translog flush
-# curl -s -XPUT 'localhost:9200/_settings' -d '{"index.translog.disable_flush": true}' >/dev/null
-## Flushes translog and check if snapshot has not already been made today
-# curl -s 'localhost:9200/_flush' | grep -qe '"ok":true' &&
-# curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/snapshot_${DATE}" | grep -qv 404
-## If it succeed, do a snapshot and remove old ones
-# if [ $? -eq 0 ]; then
-#     curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot_${DATE}?wait_for_completion=true" -o /tmp/es_snapshot_${DATE}.log
-#     cd /home/backup-elasticsearch/snaprepo
-#     for i in $(curl -s -XGET "localhost:9200/_snapshot/snaprepo/_all?pretty=true" | grep '^ *"snapshot" : "snapshot_.*",$' | cut -d_ -f2 | sed 's/",$//' | head -n-10); do
-#         curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/snapshot_${i}"
-#     done
-#     cd -
-# 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
+##  If it succeed, do a snapshot and remove old ones
+# curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot_${DATE}?wait_for_completion=true" -o /tmp/es_snapshot_${DATE}.log
+# for i in $(curl -s -XGET "localhost:9200/_snapshot/snaprepo/_all?pretty=true" | grep '^ *"snapshot" : "snapshot_.*",$' | cut -d_ -f2 | sed 's/",$//' | head -n-10); do
+#     curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/snapshot_${i}"
+# done
 
 ## RabbitMQ : export config
 #rabbitmqadmin export /home/backup/rabbitmq.config >> /var/log/evobackup.log

From bde80729419c827d94a0261fa65f3412982293a3 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Mon, 5 Mar 2018 18:24:14 +0100
Subject: [PATCH 09/23] Refactoring VagrantFile and add test section to README

* nodes are set in an array
* add ext4 nodes in addition to btrfs nodes
* run bats test from nodes
---
 README.md   | 24 +++++++++++++++++
 Vagrantfile | 75 ++++++++++++++++++++++++++++-------------------------
 2 files changed, 63 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index 54fa37e..81074a9 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,30 @@ Add this ligne
 > If you want mutiples backups in a day (1 by hour maximum) you can run `bkctld inc` multiples times
 > If you want keep incremental backup **for ever**, you just need don't run `bkctld rm`
 
+## Test
+
+You can deploy tests environmments with Vagrant :
+
+~~~
+vagrant up
+~~~
+
+### Deployment
+
+Launch rsync-auto in a terminal for automatic synchronisation of your local code with Vagrant VM :
+
+~~~
+vagrant rsync-auto
+~~~
+
+### Bats
+
+You can run [bats](https://github.com/sstephenson/bats) test with *test* provisionner :
+
+~~~
+vagrant provision --provision-with test
+~~~
+
 ## Usage
 
 ~~~
diff --git a/Vagrantfile b/Vagrantfile
index be687fe..9eda20a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -8,58 +8,61 @@ vagrantfile = File.join("#{Dir.home}", '.VagrantFile')
 load File.expand_path(vagrantfile) if File.exists?(vagrantfile)
 
 Vagrant.configure('2') do |config|
-  config.vm.synced_folder "./vagrant_share/", "/vagrant", disabled: true
+  config.vm.synced_folder "./", "/vagrant", type: "rsync", rsync__exclude: [ '.vagrant', '.git' ]
 
   config.vm.provider :libvirt do |libvirt|
     libvirt.storage :file, :size => '10G', :device => 'vdb'
   end
 
+  $install = <<SCRIPT
+ln -fs /vagrant/bkctld /usr/sbin/bkctld
+ln -fs /vagrant/tpl /usr/share/bkctld
+ln -fs /vagrant/bash_completion /usr/share/bash-completion/completions/bkctld
+ln -fs /vagrant/bkctld.conf /etc/default/bkctld
+SCRIPT
+
   $deps = <<SCRIPT
 DEBIAN_FRONTEND=noninteractive apt-get -yq install openssh-server btrfs-tools rsync lsb-base coreutils sed dash mount openssh-sftp-server libc6 bash-completion
 SCRIPT
 
-  $part = <<SCRIPT
+  $pre_part = <<SCRIPT
 lsof|awk '/backup/ { print $2 }'| xargs --no-run-if-empty kill -9
 grep -q /backup /proc/mounts && umount -R /backup
-mkfs.btrfs -f /dev/vdb
+exit 0
+SCRIPT
+
+  $post_part = <<SCRIPT
 mkdir -p /backup
 mount /dev/vdb /backup
 SCRIPT
 
-  config.vm.define :jessie do |node|
-    node.vm.hostname = "bkctld-jessie"
-    node.vm.box = "debian/jessie64"
-    config.vm.provision "backports", type: "shell" do |s|
-      s.inline = "echo 'deb http://deb.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list && apt-get update"
+  nodes = [
+    { :version => "jessie", :fs => "btrfs" },
+    { :version => "jessie", :fs => "ext4" },
+    { :version => "stretch", :fs => "btrfs" },
+    { :version => "stretch", :fs => "ext4" }
+  ]
+
+  nodes.each do |i|
+    config.vm.define "#{i[:version]}-#{i[:fs]}" do |node|
+      node.vm.hostname = "bkctld-#{i[:version]}-#{i[:fs]}"
+      node.vm.box = "debian/#{i[:version]}64"
+      config.vm.provision "deps", type: "shell", :inline => $deps
+      if ("#{i[:version]}" == "jessie") then
+        config.vm.provision "backports", type: "shell" do |s|
+          s.inline = "echo 'deb http://deb.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list && apt-get update"
+        end
+        config.vm.provision "bats", type: "shell", :inline => "DEBIAN_FRONTEND=noninteractive apt-get -yq install -t jessie-backports bats"
+      else
+        config.vm.provision "bats", type: "shell", :inline => "DEBIAN_FRONTEND=noninteractive apt-get -yq install bats"
+      end
+      config.vm.provision "install", type: "shell", :inline => $install
+      config.vm.provision "pre_part", type: "shell", :inline => $pre_part
+      config.vm.provision "part", type: "shell", :inline => "mkfs.btrfs -f /dev/vdb" if "#{i[:fs]}" == "btrfs"
+      config.vm.provision "part", type: "shell", :inline => "mkfs.ext4 -q -F /dev/vdb" if "#{i[:fs]}" == "ext4"
+      config.vm.provision "post_part", type: "shell", :inline => $post_part
+      config.vm.provision "test", type: "shell", :inline => "bats /vagrant/test/*.bats"
     end
-    config.vm.provision "deps", type: "shell", :inline => $deps
-    config.vm.provision "bats", type: "shell", :inline => "DEBIAN_FRONTEND=noninteractive apt-get -yq install -t jessie-backports bats"
-    config.vm.provision "part", type: "shell", :inline => $part
-    config.vm.provision "test", type: "shell", :path => "./test/main.bats"
   end
 
-  config.vm.define :stretch do |node|
-    node.vm.hostname = "bkctld-stretch"
-    node.vm.box = "debian/stretch64"
-    config.vm.provision "deps", type: "shell", :inline => $deps
-    config.vm.provision "bats", type: "shell", :inline => "DEBIAN_FRONTEND=noninteractive apt-get -yq install bats"
-    config.vm.provision "part", type: "shell", :inline => $part
-    config.vm.provision "test", type: "shell", :path => "./test/main.bats"
-  end
-
-  config.vm.provision "copy", type: "file" do |f|
-    f.source = "./"
-    f.destination = "~/bkctld/"
-   end
-
-  $install = <<SCRIPT
-ln -fs /home/vagrant/bkctld/bkctld /usr/sbin/bkctld
-ln -fs /home/vagrant/bkctld/tpl /usr/share/bkctld
-ln -fs /home/vagrant/bkctld/bash_completion /usr/share/bash-completion/completions/bkctld
-ln -fs /home/vagrant/bkctld/bkctld.conf /etc/default/bkctld
-SCRIPT
-
-  config.vm.provision "install", type: "shell" do |s|
-    s.inline = $install
-  end
 end

From d4307403832b4437c3651351bc1aff916e19f0f8 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Thu, 15 Mar 2018 12:41:54 +0100
Subject: [PATCH 10/23] Add bats test for NRPE check

---
 Vagrantfile    |  2 ++
 test/nrpe.bats | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100755 test/nrpe.bats

diff --git a/Vagrantfile b/Vagrantfile
index 9eda20a..e15dd93 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -19,6 +19,8 @@ ln -fs /vagrant/bkctld /usr/sbin/bkctld
 ln -fs /vagrant/tpl /usr/share/bkctld
 ln -fs /vagrant/bash_completion /usr/share/bash-completion/completions/bkctld
 ln -fs /vagrant/bkctld.conf /etc/default/bkctld
+mkdir -p /usr/lib/nagios/plugins/
+ln -fs /vagrant/check_nrpe /usr/lib/nagios/plugins/check_bkctld
 SCRIPT
 
   $deps = <<SCRIPT
diff --git a/test/nrpe.bats b/test/nrpe.bats
new file mode 100755
index 0000000..6caeddf
--- /dev/null
+++ b/test/nrpe.bats
@@ -0,0 +1,26 @@
+#!/usr/bin/env bats
+
+setup() {
+    bkctld init test
+}
+
+teardown() {
+    bkctld remove all
+}
+
+@test "ok" {
+    run /usr/lib/nagios/plugins/check_bkctld
+    [ "$status" -eq 0 ]
+}
+
+@test "warning" {
+    touch --date="$(date -d -2days)" /backup/jails/*/var/log/lastlog
+    run /usr/lib/nagios/plugins/check_bkctld
+    [ "$status" -eq 1 ]
+}
+
+@test "critical" {
+    touch --date="$(date -d -3days)" /backup/jails/*/var/log/lastlog
+    run /usr/lib/nagios/plugins/check_bkctld
+    [ "$status" -eq 2 ]
+}

From f449ea9b9f20b9ce90269aef2effa2b22e44ba1e Mon Sep 17 00:00:00 2001
From: Alexis Ben Miloud--Josselin <abenmiloud+git@evolix.fr>
Date: Wed, 21 Mar 2018 18:00:25 +0100
Subject: [PATCH 11/23] Removed useless (old) comment

---
 zzz_evobackup | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zzz_evobackup b/zzz_evobackup
index 09ec4ea..289fb55 100755
--- a/zzz_evobackup
+++ b/zzz_evobackup
@@ -123,7 +123,6 @@ mkdir -p -m 700 /home/backup
 
 ## ElasticSearch : example with rsync (warning: don't forget to use NFS if you have a cluster)
 # DATE=$(date +%F)
-##  If it succeed, do a snapshot and remove old ones
 # curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot_${DATE}?wait_for_completion=true" -o /tmp/es_snapshot_${DATE}.log
 # for i in $(curl -s -XGET "localhost:9200/_snapshot/snaprepo/_all?pretty=true" | grep '^ *"snapshot" : "snapshot_.*",$' | cut -d_ -f2 | sed 's/",$//' | head -n-10); do
 #     curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/snapshot_${i}"

From 6548c5a1d86595af6a1139bbb0a2eac8b23a3eb8 Mon Sep 17 00:00:00 2001
From: Alexis Ben Miloud--Josselin <abenmiloud+git@evolix.fr>
Date: Wed, 21 Mar 2018 18:06:00 +0100
Subject: [PATCH 12/23] Remove old logs

---
 zzz_evobackup | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zzz_evobackup b/zzz_evobackup
index 289fb55..4f9e3f8 100755
--- a/zzz_evobackup
+++ b/zzz_evobackup
@@ -126,6 +126,7 @@ mkdir -p -m 700 /home/backup
 # curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot_${DATE}?wait_for_completion=true" -o /tmp/es_snapshot_${DATE}.log
 # for i in $(curl -s -XGET "localhost:9200/_snapshot/snaprepo/_all?pretty=true" | grep '^ *"snapshot" : "snapshot_.*",$' | cut -d_ -f2 | sed 's/",$//' | head -n-10); do
 #     curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/snapshot_${i}"
+#     rm /tmp/es_snapshot_${i}.log
 # done
 
 ## RabbitMQ : export config

From 8680b742dd0c265a58ed8eb4b371ee5dc0604e04 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Mon, 26 Mar 2018 17:53:00 +0200
Subject: [PATCH 13/23] Refactoring of logging and notification

* Use logger command, no longer write directly to logfile
* Loglevel can be set in bkctld.conf
* Remove mail notification, cronjob do it when stdout/stderr
---
 bkctld        | 294 +++++++++++++++++++++-----------------------------
 bkctld.conf   |   3 +-
 docs/bkctld.8 |  14 +--
 3 files changed, 125 insertions(+), 186 deletions(-)

diff --git a/bkctld b/bkctld
index 16b6dc4..ddd2d0a 100755
--- a/bkctld
+++ b/bkctld
@@ -28,15 +28,55 @@ usage(){
     echo ""
 }
 
+## logging functions
+
+debug() {
+    msg="${1:-$(cat /dev/stdin)}"
+    if [ "${LOGLEVEL}" -ge 7 ]; then
+        echo "${msg}"
+        logger -t bkctld -p daemon.debug "${msg}"
+    fi
+}
+
+info() {
+    msg="${1:-$(cat /dev/stdin)}"
+    if [ "${LOGLEVEL}" -ge 6 ]; then
+        tty -s && echo "${msg}"
+        logger -t bkctld -p daemon.info "${msg}"
+    fi
+}
+
+notice() {
+    msg="${1:-$(cat /dev/stdin)}"
+    tty -s && echo "${msg}"
+    [ "${LOGLEVEL}" -ge 5 ] && logger -t bkctld -p daemon.notice "${msg}"
+}
+
+warning() {
+    msg="${1:-$(cat /dev/stdin)}"
+    tty -s && echo "WARNING : ${msg}" >&2
+    if [ "${LOGLEVEL}" -ge 4 ]; then
+        tty -s || echo "WARNING : ${msg}" >&2
+        logger -t bkctld -p daemon.warning "${msg}"
+    fi
+}
+
+error() {
+    msg="${1:-$(cat /dev/stdin)}"
+    tty -s && echo "ERROR : ${msg}" >&2
+    if [ "${LOGLEVEL}" -ge 5 ]; then
+        tty -s || echo "ERROR : ${msg}" >&2
+        logger -t bkctld -p daemon.error "${msg}"
+    fi
+    exit 1
+}
+
 ## check functions
 
 check_jail() {
-	jail=$1
-	if [ -d ${JAILDIR}/${jail} ]; then
-		exit 0
-	else
-		exit 1
-	fi
+	jail="${1}"
+	[ -d "${JAILDIR}/${jail}" ] && return 0
+    return 1
 }
 
 check_jail_on() {
@@ -49,9 +89,9 @@ check_jail_on() {
 	if [ "$return" -eq 1 ]; then
 		rm -f ${JAILDIR}/${jail}/${SSHD_PID}
 		grep -q "${JAILDIR}/${jail}/proc" /proc/mounts && umount --lazy ${JAILDIR}/${jail}/proc/
-	        grep -q "${JAILDIR}/${jail}/dev" /proc/mounts && umount --lazy --recursive ${JAILDIR}/${jail}/dev
+	       grep -q "${JAILDIR}/${jail}/dev" /proc/mounts && umount --lazy --recursive ${JAILDIR}/${jail}/dev
 	fi
-	exit "$return"
+	return "$return"
 }
 
 ## get functions : get info on jail
@@ -106,13 +146,9 @@ set_port() {
 set_key() {
 	jail=$1
 	keyfile=$2
-	if [ -e $keyfile ]; then
-		cat $keyfile > ${JAILDIR}/${jail}/${AUTHORIZED_KEYS}
-		chmod 600 ${JAILDIR}/${jail}/${AUTHORIZED_KEYS}
-	else
-		echo "Keyfile $keyfile dosen't exist !" >&2
-		exit 1
-	fi
+    [ -e "${keyfile}" ] || error "Keyfile $keyfile dosen't exist !"
+    cat $keyfile > ${JAILDIR}/${jail}/${AUTHORIZED_KEYS}
+	chmod 600 ${JAILDIR}/${jail}/${AUTHORIZED_KEYS}
 }
 
 set_ip() {
@@ -164,7 +200,7 @@ mk_jail() {
 	[ -f "${LOCALTPLDIR}/sshrc" ] && group="${LOCALTPLDIR}/sshrc"
 	umask 077
 
-	echo "1 - Creating the chroot"
+	info "1 - Creating the chroot"
 	cd "${JAILDIR}/${jail}"
 	rm -rf bin lib lib64 run usr var/run etc/ssh/*key
 	mkdir -p dev proc
@@ -177,7 +213,7 @@ mk_jail() {
 	ln -st var ../run
 	touch var/log/lastlog var/log/wtmp run/utmp
 
-	echo "2 - Copying essential files"
+	info "2 - Copying essential files"
 	[ -f /etc/ssh/ssh_host_rsa_key ] && cp /etc/ssh/ssh_host_rsa_key etc/ssh
 	[ -f /etc/ssh/ssh_host_ecdsa_key ] && cp /etc/ssh/ssh_host_ecdsa_key etc/ssh
 	[ -f /etc/ssh/ssh_host_ed25519_key ] && cp /etc/ssh/ssh_host_ed25519_key etc/ssh
@@ -186,7 +222,7 @@ mk_jail() {
 	cp "$group" etc
 	cp "$sshrc" etc/ssh
 
-	echo "3 - Copying binaries"
+	info "3 - Copying binaries"
 	cp -f /lib/ld-linux.so.2 lib 2>/dev/null || cp -f /lib64/ld-linux-x86-64.so.2 lib64
 	cp /lib/x86_64-linux-gnu/libnss* lib/x86_64-linux-gnu
 
@@ -206,12 +242,8 @@ sub_init() {
 	inctpl="${TPLDIR}/inc.tpl"
 	[ -f "${LOCALTPLDIR}/sshd_config" ] && sshd_config="${LOCALTPLDIR}/sshd_config"
 	[ -f "${LOCALTPLDIR}/inc.tpl" ] && inctpl="${LOCALTPLDIR}/inc.tpl"
-	if ( check_jail $jail ); then
-		echo "Jail $jail already exist ! Use '$0 update $jail' for update it" >&2
-                exit 1		
-	fi
+	check_jail $jail && error "${jail} : trying to create existant jail"
 
-	echo "Create jail $jail :"
 	rootdir=$(dirname "$JAILDIR")
 	rootdir_inode=$(stat --format=%i "$rootdir")
 	jaildir_inode=$(stat --format=%i $JAILDIR)
@@ -221,77 +253,58 @@ sub_init() {
 		mkdir -p ${JAILDIR}/${jail}
 	fi
 	mk_jail $jail
-	echo "4 - Copie default sshd_config"
+	info "4 - Copie default sshd_config"
 	install -m 0640 $sshd_config ${JAILDIR}/$jail/${SSHD_CONFIG}
-	echo "5 - Set usable sshd port"
+	info "5 - Set usable sshd port"
 	set_port $jail auto
-	echo "6 - Copie default inc configuration"
+	info "6 - Copie default inc configuration"
 	install -m 0640 $inctpl ${CONFDIR}/$jail
+	notice "${jail} : created jail"
 }
 
 sub_update() {
 	jail=$1
-	if ! ( check_jail $jail ); then
-		echo "Jail $jail doesn't exist ! Use '$0 init $jail' for create it !" >&2
-                exit 1
-	fi
-	
-	status=$(check_jail_on $jail)
-	if ( $status ); then
-		log stop $jail
-	fi
-	echo "Update jail $jail :"
+	check_jail $jail || error "${jail} : trying to update inexistant jail"
+	check_jail_on $jail && sub_stop $jail
+
 	mk_jail $jail
-	if ( $status ); then
-	        log start $jail
-	fi
+	notice "${jail} : updated jail"
 }
 
 sub_remove() {
 	jail=$1
-	if ! ( check_jail $jail ); then
-		echo "Jail $jail doesn't exist !" >&2
-                exit 1
-	fi
+	check_jail $jail || error "${jail} : trying to remove inexistant jail"
 
-	if ( check_jail_on $jail ); then
-	        log stop $jail
-	fi
-	echo "Delete jail $jail"
+	check_jail_on $jail && sub_stop $jail
+	
 	rm -f ${CONFDIR}/${jail}
 	jail_inode=$(stat --format=%i ${JAILDIR}/${jail})
 	if [ "$jail_inode" -eq 256 ]; then
-		$BTRFS subvolume delete ${JAILDIR}/${jail}
+		$BTRFS subvolume delete ${JAILDIR}/${jail} | debug
 	else
-		rm -rf ${JAILDIR}/${jail}
+		rm -rf ${JAILDIR}/${jail} | debug
 	fi
 	if [ -d  ${INCDIR}/${jail} ]; then
 		incs=$(ls ${INCDIR}/${jail})
 		for inc in $incs; do
 			inc_inode=$(stat --format=%i ${INCDIR}/${jail}/$inc)
 			if [ "$inc_inode" -eq 256 ]; then
-				$BTRFS subvolume delete ${INCDIR}/${jail}/${inc}
+				$BTRFS subvolume delete ${INCDIR}/${jail}/${inc} | debug
 			else
-				echo "You need to purge ${INCDIR}/${jail}/$inc manually !" >&2
+				warning "You need to purge ${INCDIR}/${jail}/$inc manually !"
 			fi
 		done
-		rmdir --ignore-fail-on-non-empty ${INCDIR}/${jail}
+		rmdir --ignore-fail-on-non-empty ${INCDIR}/${jail} | debug
 	fi
 	set_firewall $jail
+    notice "${jail} : deleted jail"
 }
 
 sub_start() {
 	jail=$1
-	if ! ( check_jail $jail ); then
-                echo "Jail $jail doesn't exist ! Create it with '$0 init $jail'" >&2
-                exit 1
-        fi
-	if ( check_jail_on $jail ); then
-		echo "Jail $jail already running !" >&2
-		exit 1
-	fi
+	check_jail $jail || error "${jail} : trying to start inexistant jail"
+	check_jail_on $jail && error "${jail} : trying to start already running jail"
 
-	echo "Start jail $jail"
 	cd "${JAILDIR}/${jail}"
 	grep -q "${JAILDIR}/${jail}/proc" /proc/mounts || mount -t proc "proc-${jail}" proc
 	grep -q "${JAILDIR}/${jail}/dev" /proc/mounts || mount -nt tmpfs "dev-${jail}" dev
@@ -312,51 +325,39 @@ sub_start() {
 	mkdir -p dev/shm
 	grep -q "${JAILDIR}/${jail}/dev/pts" /proc/mounts || mount -t devpts -o gid=4,mode=620 none dev/pts
 	grep -q "${JAILDIR}/${jail}/dev/shm" /proc/mounts || mount -t tmpfs none dev/shm
-	chroot "${JAILDIR}/${jail}" /usr/sbin/sshd -E /var/log/authlog
+	chroot "${JAILDIR}/${jail}" /usr/sbin/sshd -E /var/log/authlog || error "${jail} : error on starting sshd"
+    pid=$(cat "${JAILDIR}/${jail}/${SSHD_PID}")
+    notice "${jail} was started [${pid}]"
 }
 
 sub_stop() {
 	jail=$1
-	if ! ( check_jail $jail ); then
-                echo "Jail $jail doesn't exist !" >&2
-                exit 1
-        fi
-	if ! ( check_jail_on $jail ); then
-		echo "Jail $jail doesnt't run !" >&2
-		exit 1
-	fi
+	check_jail $jail || error "${jail} : trying to stop inexistant jail"
+	check_jail_on $jail || error "${jail} : trying to stop not running jail"
 
-	echo "Stop jail $jail"
 	pid=$(cat ${JAILDIR}/${jail}/${SSHD_PID})
 	for conn in $(ps --ppid $pid -o pid=); do
 		kill $conn
 	done
-	kill $pid
+	kill $pid && notice "${jail} was stopped [${pid}]"
 	umount --lazy --recursive ${JAILDIR}/${jail}/dev
 	umount --lazy ${JAILDIR}/${jail}/proc/
 }
 
 sub_reload() {
 	jail=$1
-	if ! ( check_jail $jail ); then
-                echo "Jail $jail doesn't exist !" >&2
-                exit 1
-        fi
-	if ! ( check_jail_on $jail ); then
-		echo "Jail $jail doesnt't run !" >&2
-		exit 1
-	fi
+	check_jail $jail || error "${jail} : trying to reload inexistant jail"
+	check_jail_on $jail || error "${jail} : trying to reload not running jail"
 
-	echo "Reload jail $jail"
-	pkill -HUP -F ${JAILDIR}/${jail}/${SSHD_PID}
+    pid=$(cat "${JAILDIR}/${jail}/${SSHD_PID}")
+
+	pkill -HUP "${pid}"
+    notice "${jail} was reloaded [${pid}]"
 }
 
 sub_status() {
 	jail=$1
-	if ! ( check_jail $jail ); then
-		echo "Jail $jail doesn't exist ! Use '$0 status' for list all" >&2
-                exit 1
-	fi
+	check_jail $jail || error "${jail} : inexistant jail ! Use '$0 status' for list all"
 
 	inc=$(get_inc $jail)
 	if ( check_jail_on $jail ); then
@@ -373,46 +374,37 @@ sub_params() {
 	jail=$1
 	params=$2
 	option=$3
-	if ! ( check_jail $jail ); then
-                echo "Jail $jail doesn't exist ! Create it with '$0 init $jail'" >&2
-                exit 1
-        fi
+	check_jail $jail || error "${jail} : inexistant jail'"
 
 	if [ -z "${option}" ]; then
 	        get_${params} $jail
 	else
 	        set_${params} $jail $option
-		echo "Update $jail : $params = $option"
+		notice "${jail} : update $params => $option"
 	fi
 }
 
 sub_sync() {
 	jail=$1
-	if ! ( check_jail $jail ); then
-                echo "Jail $jail doesn't exist !" >&2
-                exit 1
-        fi
+    check_jail $jail || error "${jail} : trying to sync inexistant jail"
+
+	[ -n "${NODE}" ] || error "Sync need config of \$NODE in /etc/default/bkctld !"
 
-	if [ -z "${NODE}" ]; then
-		echo "You must define \$NODE in /etc/default/bkctld !" >&2
-		exit 1
-	fi
 	jail=$1
-	ssh $NODE bkctld init $jail >/dev/null
+	ssh $NODE bkctld init $jail | debug
 	rsync -a ${JAILDIR}/${jail}/ ${NODE}:${JAILDIR}/${jail}/ --exclude proc/* --exclude sys/* --exclude dev/* --exclude run --exclude var/backup/*
 	rsync -a ${CONFDIR}/$jail ${NODE}:${CONFDIR}/$jail
 	if ( check_jail_on $jail ); then
-		ssh $NODE bkctld start $jail >/dev/null
+		ssh $NODE bkctld start $jail | debug
 	fi
 	if [ -n "${FIREWALL_RULES}" ]; then
 		rsync -a ${FIREWALL_RULES} ${NODE}:${FIREWALL_RULES}
-		ssh $NODE /etc/init.d/minifirewall restart >/dev/null
+		ssh $NODE /etc/init.d/minifirewall restart | debug
 	fi
 }
 
 sub_inc() {
 	date=$(date +"%Y-%m-%d-%H")
-	incs_logs=""
 	jails=$(ls $JAILDIR)
 	for jail in $jails; do
 		inc="${INCDIR}/${jail}/${date}"
@@ -421,23 +413,16 @@ sub_inc() {
 			start=$(date +"%H:%M:%S")
 			jail_inode=$(stat --format=%i ${JAILDIR}/${jail})
 			if [ "$jail_inode" -eq 256 ]; then
-				$BTRFS subvolume snapshot -r ${JAILDIR}/${jail} $inc > /dev/null
+				$BTRFS subvolume snapshot -r ${JAILDIR}/${jail} $inc | debug
 			else
-				cp -alx ${JAILDIR}/${jail}/ $inc
+				cp -alx ${JAILDIR}/${jail}/ $inc | debug
 			fi
 			end=$(date +"%H:%M:%S")
-			inc_log="Create $date inc of $jail (Start at $start / End at $end)"
-			echo "${inc_log}"
-			incs_logs="${incs_logs} ${inc_log}"
+            notice "${jail} : made $date inc [$start/$end]"
 		else
-			echo "Inc $date of $jail already exist !" >&2
+            warning "${jail} : trying to made already existant inc"
 		fi
 	done
-	if [ -n "${NOTIF_MAIL}" ]; then
-		if [ -n "${incs_logs}" ]; then
-			echo "${incs_logs}" | mail -s "[info] EvoBackup - create incs" $NOTIF_MAIL
-		fi
-	fi
 }
 
 sub_rm() {
@@ -448,15 +433,10 @@ sub_rm() {
 		pid=$(cat $pidfile)
 		ps -u $pid >/dev/null
 		if [ $? -eq 0 ]; then
-			echo "$0 rm always run (PID $pid) !" >&2
 			kill -9 $pid
-			rm $pidfile
-			if [ -n "${NOTIF_MAIL}" ]; then
-			        echo "$0 rm $pid was killed by $$ !" | mail -s "[warn] EvoBackup - purge incs interrupted" $NOTIF_MAIL
-			fi
-		else
-			rm $pidfile
+			warning "$0 rm always run (PID $pid), killed by $$ !"
 		fi
+		rm $pidfile
         fi
 	echo $$ > $pidfile
 	rms_logs=""
@@ -474,59 +454,36 @@ sub_rm() {
 				start=$(date +"%H:%M:%S")
 				inc_inode=$(stat --format=%i "${INCDIR}/${jail}/${j}")
 				if [ "$inc_inode" -eq 256 ]; then
-				        $BTRFS subvolume delete "${INCDIR}/${jail}/${j}" >/dev/null
+				        $BTRFS subvolume delete "${INCDIR}/${jail}/${j}" | debug
 				else
 				        cd "${INCDIR}/$jail"
 				        rsync -a --delete "$empty/" "$j/"
 				        rmdir "$j"
 				fi
 				end=$(date +"%H:%M:%S")
-				rm_log="Delete $j inc of $jail (Start at $start / End at $end)"
-				echo "${rm_log}"
-				rms_logs="${rms_logs} ${rm_log}"
+				notice "${jail} : deleted $j inc [$start/$end]"
 			done
 		fi
 	done
 	rmdir $empty
 	rm $pidfile
-	if [ -n "${NOTIF_MAIL}" ]; then
-		if [ -n "${rms_logs}" ]; then
-	                echo "${rms_logs}" | mail -s "[info] EvoBackup - purge incs" $NOTIF_MAIL
-		fi
-        fi
-}
-
-## log function
-
-log() {
-	subcommand=$1
-	logfile="${LOG_DIR}/bkctld.log"
-        shift
-        tty -s
-        if [ $? -eq 0 ]; then
-                sub_${subcommand} "$@" 2>&1 | tee -a $logfile
-        else
-                sub_${subcommand} "$@" >> $logfile 2>&1
-        fi	
 }
 
 ## main function : check usage and valid params
 
 main() {
-	if [ "$(id -u)" -ne 0 ]; then
-	    echo "Error, you need to be root to run $0 !" >&2
-	    exit 1
-	fi
+	[ "$(id -u)" -ne 0 ] && error "You need to be root to run $0 !"
+
 	[ -f /etc/default/bkctld ] && . /etc/default/bkctld
 	[ -z "${CONFDIR}" ] && CONFDIR='/etc/evobackup'
 	[ -z "${JAILDIR}" ] && JAILDIR='/backup/jails'
 	[ -z "${INCDIR}" ] && INCDIR='/backup/incs'
 	[ -z "${TPLDIR}" ] && TPLDIR='/usr/share/bkctld'
 	[ -z "${LOCALTPLDIR}" ] && LOCALTPLDIR='/usr/local/share/bkctld'
-	[ -z "${LOG_DIR}" ] && LOG_DIR='/var/log'
 	[ -z "${SSHD_PID}" ] && SSHD_PID='/run/sshd.pid'
 	[ -z "${SSHD_CONFIG}" ] && SSHD_CONFIG='/etc/ssh/sshd_config'
 	[ -z "${AUTHORIZED_KEYS}" ] && AUTHORIZED_KEYS='/root/.ssh/authorized_keys'
+    [ -z "${LOGLEVEL}" ] && LOGLEVEL=6
 	BTRFS=$(which btrfs)
 	mkdir -p $CONFDIR $JAILDIR $INCDIR
 	subcommand=$1
@@ -537,18 +494,18 @@ main() {
 	        usage
 	        ;;
 	    "inc" | "rm")
-		log $subcommand
+	        "sub_${subcommand}"
 		;;
             "init")
 		if [ -n "${jail}" ]; then
-			log $subcommand $jail
+			"sub_${subcommand}" $jail
 		else
 			usage
 		fi
 		;;
 	    "key" | "port" | "ip")
 		if [ -n "${jail}" ]; then
-			log params $jail $subcommand $option
+			sub_params $jail $subcommand $option
 		else
 			usage
 		fi
@@ -560,34 +517,26 @@ main() {
 				for jail in $jails; do
 					case $subcommand in
 					    "start")
-						if ! ( check_jail_on $jail ); then
-							log $subcommand $jail
-						fi
+						check_jail_on $jail || "sub_${subcommand}" $jail
 						;;
 					    "stop" | "reload")
-						if ( check_jail_on $jail ); then
-							log $subcommand $jail
-						fi
+						check_jail_on $jail && "sub_${subcommand}" $jail
 						;;
 					    "restart")
-						if ( check_jail_on $jail ); then
-							log stop $jail
-	                                        fi
-						log start $jail
+						check_jail_on $jail && sub_stop $jail
+						sub_start $jail
 						;;
 					    *)
-							log $subcommand $jail
+							"sub_${subcommand}" $jail
 						;;
 					esac
 		                done
 			else
 				if [ "${subcommand}" != "restart" ]; then
-					log $subcommand $jail
+					"sub_${subcommand}" $jail
 				else
-					if ( check_jail_on $jail ); then
-						log stop $jail
-					fi
-					log start $jail
+					check_jail_on $jail && sub_stop $jail
+					sub_start $jail
 				fi
 			fi
 		else
@@ -598,16 +547,15 @@ main() {
 		if [ -z "${jail}" ]; then
 			jails=$(ls $JAILDIR)
 			for jail in $jails; do
-	                        sub_$subcommand $jail
-	                done
+                "sub_${subcommand}" $jail
+	        done
 		else
-			sub_$subcommand $jail
+			"sub_${subcommand}" $jail
 		fi
 		;;
 	    *)
 	        shift
-	        echo "Error: '${subcommand}' is not a known subcommand." >&2
-		usage
+	        warning "'${subcommand}' is not a known subcommand." && usage
 	       	exit 1
 	        ;;
 	esac
diff --git a/bkctld.conf b/bkctld.conf
index 0e6b2c3..4982f36 100644
--- a/bkctld.conf
+++ b/bkctld.conf
@@ -6,9 +6,8 @@
 #INCDIR='/backup/incs'
 #TPLDIR='/usr/share/bkctld'
 #LOCALTPLDIR='/usr/local/share/bkctld'
-#LOG_DIR='/var/log'
 #SSHD_PID='/var/run/sshd.pid'
 #SSHD_CONFIG='/etc/ssh/sshd_config'
 #AUTHORIZED_KEYS='/root/.ssh/authorized_keys'
 #FIREWALL_RULES='/etc/firewall.rc.jails'
-#NOTIF_MAIL='test@example.com'
+#LOGLEVEL=6
diff --git a/docs/bkctld.8 b/docs/bkctld.8
index 251378d..009d4d6 100644
--- a/docs/bkctld.8
+++ b/docs/bkctld.8
@@ -138,26 +138,18 @@ Dir for surcharge jail templates.
 default : /usr/local/share/bkctld
 .RE
 .PP
-LOG_DIR
+LOGLEVEL
 .RS 4
-Emplacement of log directory.
+Define loglevel, based on syslog severity level
 .RE
 .RS 4
-default : /var/log
+default : 6
 .RE
 .PP
 .SH OPTIONALS VARS
 Optionnals vars are no default value. No set them desactivate correspondant fonctionnality.
 .RE
 .PP
-NOTIF_MAIL
-.RS 4
-Mail address were notification mail will be set.
-.RE
-.RS 4
-Default : no mail notification
-.RE
-.PP
 FIREWALL_RULES
 .RS 4
 Configuration file were firewall was configured to allow jail access. This file must be sourced by your firewall configuration tool.

From 0927e7995415a349200f8e29c2f1fb4035bf2c97 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Tue, 27 Mar 2018 16:31:50 +0200
Subject: [PATCH 14/23] Use cat instead of echo for usage function

---
 bkctld | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/bkctld b/bkctld
index ddd2d0a..38ab963 100755
--- a/bkctld
+++ b/bkctld
@@ -9,23 +9,25 @@
 #
 
 usage(){
-    echo "Usage: $0 <subcommand> [options]"
-    echo "Subcommands:"
-    echo "	init		<jailname>					Init jail <jailname>"
-    echo "	update		<jailname>|all					Update jail <jailname> or all"
-    echo "	remove		<jailname>|all					Remove jail <jailname> or all"
-    echo "	start		<jailname>|all					Start jail <jailname> or all"
-    echo "	stop		<jailname>|all					Stop jail <jailname> or all"
-    echo "	reload		<jailname>|all					Reload jail <jailname> or all"
-    echo "	restart		<jailname>|all					Restart jail <jailname> or all"
-    echo "	sync		<jailname>|all					Sync jail <jailname> or all to another node"
-    echo "	status		[<jailname>]					Print status of <jailname> (default all jail)"
-    echo "	key		<jailname>		[<keyfile>]		Set or get ssh pubic key of <jailname>"
-    echo "	port		<jailname>		[<ssh_port>|auto]	Set or get ssh port of <jailname>"
-    echo "	ip		<jailname>		[<ip>|all]		Set or get allowed(s) ip(s) of <jailname>"
-    echo "	inc								Make incremental inc of all jails"
-    echo "	rm								Remove old incremtal inc of all jails"
-    echo ""
+    cat <<EOF
+Usage: $0 <subcommand> [options]
+Subcommands:
+	init		<jailname>					Init jail <jailname>
+	update		<jailname>|all					Update jail <jailname> or all
+	remove		<jailname>|all					Remove jail <jailname> or all
+	start		<jailname>|all					Start jail <jailname> or all
+	stop		<jailname>|all					Stop jail <jailname> or all
+	reload		<jailname>|all					Reload jail <jailname> or all
+	restart		<jailname>|all					Restart jail <jailname> or all
+	sync		<jailname>|all					Sync jail <jailname> or all to another node
+	status		[<jailname>]					Print status of <jailname> (default all jail)
+	key		<jailname>		[<keyfile>]		Set or get ssh pubic key of <jailname>
+	port		<jailname>		[<ssh_port>|auto]	Set or get ssh port of <jailname>
+	ip		<jailname>		[<ip>|all]		Set or get allowed(s) ip(s) of <jailname>
+	inc								Make incremental inc of all jails
+	rm								Remove old incremtal inc of all jails
+
+EOF
 }
 
 ## logging functions

From d565374c5d9cdd30b1cad59876747e2fbafa0b3d Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Tue, 27 Mar 2018 16:39:03 +0200
Subject: [PATCH 15/23] Retab

---
 bkctld | 778 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 388 insertions(+), 390 deletions(-)

diff --git a/bkctld b/bkctld
index 38ab963..6dde62e 100755
--- a/bkctld
+++ b/bkctld
@@ -12,20 +12,20 @@ usage(){
     cat <<EOF
 Usage: $0 <subcommand> [options]
 Subcommands:
-	init		<jailname>					Init jail <jailname>
-	update		<jailname>|all					Update jail <jailname> or all
-	remove		<jailname>|all					Remove jail <jailname> or all
-	start		<jailname>|all					Start jail <jailname> or all
-	stop		<jailname>|all					Stop jail <jailname> or all
-	reload		<jailname>|all					Reload jail <jailname> or all
-	restart		<jailname>|all					Restart jail <jailname> or all
-	sync		<jailname>|all					Sync jail <jailname> or all to another node
-	status		[<jailname>]					Print status of <jailname> (default all jail)
-	key		<jailname>		[<keyfile>]		Set or get ssh pubic key of <jailname>
-	port		<jailname>		[<ssh_port>|auto]	Set or get ssh port of <jailname>
-	ip		<jailname>		[<ip>|all]		Set or get allowed(s) ip(s) of <jailname>
-	inc								Make incremental inc of all jails
-	rm								Remove old incremtal inc of all jails
+    init        <jailname>                      Init jail <jailname>
+    update      <jailname>|all                  Update jail <jailname> or all
+    remove      <jailname>|all                  Remove jail <jailname> or all
+    start       <jailname>|all                  Start jail <jailname> or all
+    stop        <jailname>|all                  Stop jail <jailname> or all
+    reload      <jailname>|all                  Reload jail <jailname> or all
+    restart     <jailname>|all                  Restart jail <jailname> or all
+    sync        <jailname>|all                  Sync jail <jailname> or all to another node
+    status      [<jailname>]                    Print status of <jailname> (default all jail)
+    key         <jailname>      [<keyfile>]     Set or get ssh pubic key of <jailname>
+    port        <jailname>      [<port>|auto]   Set or get ssh port of <jailname>
+    ip          <jailname>      [<ip>|all]      Set or get allowed(s) ip(s) of <jailname>
+    inc                                         Make incremental inc of all jails
+    rm                                          Remove old incremtal inc of all jails
 
 EOF
 }
@@ -76,491 +76,489 @@ error() {
 ## check functions
 
 check_jail() {
-	jail="${1}"
-	[ -d "${JAILDIR}/${jail}" ] && return 0
+    jail="${1}"
+    [ -d "${JAILDIR}/${jail}" ] && return 0
     return 1
 }
 
 check_jail_on() {
-	jail=$1
-	return=1
-	if [ -f ${JAILDIR}/${jail}/${SSHD_PID} ]; then
-	        pid=$(cat ${JAILDIR}/${jail}/${SSHD_PID})
-	        ps -p $pid > /dev/null && return=0
-	fi
-	if [ "$return" -eq 1 ]; then
-		rm -f ${JAILDIR}/${jail}/${SSHD_PID}
-		grep -q "${JAILDIR}/${jail}/proc" /proc/mounts && umount --lazy ${JAILDIR}/${jail}/proc/
-	       grep -q "${JAILDIR}/${jail}/dev" /proc/mounts && umount --lazy --recursive ${JAILDIR}/${jail}/dev
-	fi
-	return "$return"
+    jail=$1
+    return=1
+    if [ -f ${JAILDIR}/${jail}/${SSHD_PID} ]; then
+        pid=$(cat ${JAILDIR}/${jail}/${SSHD_PID})
+        ps -p $pid > /dev/null && return=0
+    fi
+    if [ "$return" -eq 1 ]; then
+        rm -f ${JAILDIR}/${jail}/${SSHD_PID}
+        grep -q "${JAILDIR}/${jail}/proc" /proc/mounts && umount --lazy ${JAILDIR}/${jail}/proc/
+        grep -q "${JAILDIR}/${jail}/dev" /proc/mounts && umount --lazy --recursive ${JAILDIR}/${jail}/dev
+    fi
+    return "$return"
 }
 
 ## get functions : get info on jail
 
 get_port() {
-	jail=$1
-	port=$(grep -E "Port [0-9]+" ${JAILDIR}/${jail}/${SSHD_CONFIG}|grep -oE "[0-9]+")
-	echo $port
+    jail=$1
+    port=$(grep -E "Port [0-9]+" ${JAILDIR}/${jail}/${SSHD_CONFIG}|grep -oE "[0-9]+")
+    echo $port
 }
 
 get_key() {
-	jail=$1
-	if [ -f ${JAILDIR}/${jail}/${AUTHORIZED_KEYS} ]; then
-		cat ${JAILDIR}/${jail}/${AUTHORIZED_KEYS}
-	fi
+    jail=$1
+    if [ -f ${JAILDIR}/${jail}/${AUTHORIZED_KEYS} ]; then
+        cat ${JAILDIR}/${jail}/${AUTHORIZED_KEYS}
+    fi
 }
 
 get_ip() {
-	jail=$1
-	grep -E "^AllowUsers" "${JAILDIR}/$jail/${SSHD_CONFIG}"|grep -Eo "root@[^ ]+"| while read allow; do
-		echo "$allow"|cut -d'@' -f2
-	done
+    jail=$1
+    grep -E "^AllowUsers" "${JAILDIR}/$jail/${SSHD_CONFIG}"|grep -Eo "root@[^ ]+"| while read allow; do
+        echo "$allow"|cut -d'@' -f2
+    done
 }
 
 get_inc() {
-	jail=$1
-	inc="0"
+    jail=$1
+    inc="0"
         if [ -f ${CONFDIR}/${jail} ]; then
-                day=$(grep -c "day" ${CONFDIR}/${jail})
-                month=$(grep -c "month" ${CONFDIR}/${jail})
-                inc="${day}/${month}"
+            day=$(grep -c "day" ${CONFDIR}/${jail})
+            month=$(grep -c "month" ${CONFDIR}/${jail})
+            inc="${day}/${month}"
         fi
-	echo $inc
+    echo $inc
 }
 
 ## set functions : set info on jail
 
 set_port() {
-	jail=$1
-	port=$2
-	if [ "$port" = "auto" ]; then
-		port=$(grep -h Port ${JAILDIR}/*/${SSHD_CONFIG} 2>/dev/null | grep -Eo "[0-9]+" | sort -n | tail -1)
-	        port=$((port+1))
-        	if [ ! $port -gt 1 ]; then
-			port=2222
-	        fi
-	fi
-        sed -i "s/^Port .*/Port ${port}/" ${JAILDIR}/$jail/${SSHD_CONFIG}
-	set_firewall $jail
+    jail=$1
+    port=$2
+    if [ "$port" = "auto" ]; then
+        port=$(grep -h Port ${JAILDIR}/*/${SSHD_CONFIG} 2>/dev/null | grep -Eo "[0-9]+" | sort -n | tail -1)
+        port=$((port+1))
+        [ "${port}" -le 1 ] && port=2222
+    fi
+    sed -i "s/^Port .*/Port ${port}/" ${JAILDIR}/$jail/${SSHD_CONFIG}
+    set_firewall $jail
 }
 
 set_key() {
-	jail=$1
-	keyfile=$2
+    jail=$1
+    keyfile=$2
     [ -e "${keyfile}" ] || error "Keyfile $keyfile dosen't exist !"
     cat $keyfile > ${JAILDIR}/${jail}/${AUTHORIZED_KEYS}
-	chmod 600 ${JAILDIR}/${jail}/${AUTHORIZED_KEYS}
+    chmod 600 ${JAILDIR}/${jail}/${AUTHORIZED_KEYS}
 }
 
 set_ip() {
-	jail=$1
-	ip=$2
-	if [ "$ip" = "all" ] || [ "$ip" = "0.0.0.0/0" ]; then
-		ips="0.0.0.0/0"
-	else
-		ips=$(get_ip $jail)
-		ips=$(echo $ips $ip|xargs -n1|grep -v "0.0.0.0/0"|sort|uniq)
-	fi
-	allow="AllowUsers"
-	for ip in $ips; do
-		allow="$allow root@${ip}"
-	done
-	sed -i "s~^AllowUsers .*~${allow}~" ${JAILDIR}/$jail/${SSHD_CONFIG}
-	set_firewall $jail
+    jail=$1
+    ip=$2
+    if [ "$ip" = "all" ] || [ "$ip" = "0.0.0.0/0" ]; then
+        ips="0.0.0.0/0"
+    else
+        ips=$(get_ip $jail)
+        ips=$(echo $ips $ip|xargs -n1|grep -v "0.0.0.0/0"|sort|uniq)
+    fi
+    allow="AllowUsers"
+    for ip in $ips; do
+        allow="$allow root@${ip}"
+    done
+    sed -i "s~^AllowUsers .*~${allow}~" ${JAILDIR}/$jail/${SSHD_CONFIG}
+    set_firewall $jail
 }
 
 set_firewall() {
-	jail=$1
-	if [ -n "${FIREWALL_RULES}" ]; then
-		if [ -f $FIREWALL_RULES ]; then
-			sed -i "/#${jail}$/d" $FIREWALL_RULES
-		fi
-		if ( check_jail $jail ); then
-			port=$(get_port $jail)
-			for ip in $(get_ip $jail); do
-				echo "/sbin/iptables -A INPUT -p tcp --sport 1024: --dport $port -s $ip -j ACCEPT #$jail" >> $FIREWALL_RULES
-			done
-			if [ -f /etc/init.d/minifirewall ]; then
-				/etc/init.d/minifirewall restart >/dev/null
-			fi
-		fi
-	fi
+    jail=$1
+    if [ -n "${FIREWALL_RULES}" ]; then
+        if [ -f $FIREWALL_RULES ]; then
+            sed -i "/#${jail}$/d" $FIREWALL_RULES
+        fi
+        if ( check_jail $jail ); then
+            port=$(get_port $jail)
+            for ip in $(get_ip $jail); do
+                echo "/sbin/iptables -A INPUT -p tcp --sport 1024: --dport $port -s $ip -j ACCEPT #$jail" >> $FIREWALL_RULES
+            done
+            if [ -f /etc/init.d/minifirewall ]; then
+                /etc/init.d/minifirewall restart >/dev/null
+            fi
+        fi
+    fi
 }
 
 ## mk_jail function : create or update a jail
 
 mk_jail() {
-	jail=$1
-	passwd="${TPLDIR}/passwd"
-	shadow="${TPLDIR}/shadow"
-	group="${TPLDIR}/group"
-	sshrc="${TPLDIR}/sshrc"
-	[ -f "${LOCALTPLDIR}/passwd" ] && passwd="${LOCALTPLDIR}/passwd"
-	[ -f "${LOCALTPLDIR}/shadow" ] && shadow="${LOCALTPLDIR}/shadow"
-	[ -f "${LOCALTPLDIR}/group" ] && group="${LOCALTPLDIR}/group"
-	[ -f "${LOCALTPLDIR}/sshrc" ] && group="${LOCALTPLDIR}/sshrc"
-	umask 077
+    jail=$1
+    passwd="${TPLDIR}/passwd"
+    shadow="${TPLDIR}/shadow"
+    group="${TPLDIR}/group"
+    sshrc="${TPLDIR}/sshrc"
+    [ -f "${LOCALTPLDIR}/passwd" ] && passwd="${LOCALTPLDIR}/passwd"
+    [ -f "${LOCALTPLDIR}/shadow" ] && shadow="${LOCALTPLDIR}/shadow"
+    [ -f "${LOCALTPLDIR}/group" ] && group="${LOCALTPLDIR}/group"
+    [ -f "${LOCALTPLDIR}/sshrc" ] && group="${LOCALTPLDIR}/sshrc"
+    umask 077
 
-	info "1 - Creating the chroot"
-	cd "${JAILDIR}/${jail}"
-	rm -rf bin lib lib64 run usr var/run etc/ssh/*key
-	mkdir -p dev proc
-	mkdir -p usr/bin usr/sbin usr/lib usr/lib/x86_64-linux-gnu usr/lib/openssh usr/lib64
-	mkdir -p etc/ssh var/log run/sshd
-	mkdir -p root/.ssh var/backup -m 0700
-	ln -s usr/bin bin
-	ln -s usr/lib lib
-	ln -s usr/lib64 lib64
-	ln -st var ../run
-	touch var/log/lastlog var/log/wtmp run/utmp
+    info "1 - Creating the chroot"
+    cd "${JAILDIR}/${jail}"
+    rm -rf bin lib lib64 run usr var/run etc/ssh/*key
+    mkdir -p dev proc
+    mkdir -p usr/bin usr/sbin usr/lib usr/lib/x86_64-linux-gnu usr/lib/openssh usr/lib64
+    mkdir -p etc/ssh var/log run/sshd
+    mkdir -p root/.ssh var/backup -m 0700
+    ln -s usr/bin bin
+    ln -s usr/lib lib
+    ln -s usr/lib64 lib64
+    ln -st var ../run
+    touch var/log/lastlog var/log/wtmp run/utmp
 
-	info "2 - Copying essential files"
-	[ -f /etc/ssh/ssh_host_rsa_key ] && cp /etc/ssh/ssh_host_rsa_key etc/ssh
-	[ -f /etc/ssh/ssh_host_ecdsa_key ] && cp /etc/ssh/ssh_host_ecdsa_key etc/ssh
-	[ -f /etc/ssh/ssh_host_ed25519_key ] && cp /etc/ssh/ssh_host_ed25519_key etc/ssh
-	cp "$passwd" etc
-	cp "$shadow" etc
-	cp "$group" etc
-	cp "$sshrc" etc/ssh
+    info "2 - Copying essential files"
+    [ -f /etc/ssh/ssh_host_rsa_key ] && cp /etc/ssh/ssh_host_rsa_key etc/ssh
+    [ -f /etc/ssh/ssh_host_ecdsa_key ] && cp /etc/ssh/ssh_host_ecdsa_key etc/ssh
+    [ -f /etc/ssh/ssh_host_ed25519_key ] && cp /etc/ssh/ssh_host_ed25519_key etc/ssh
+    cp "$passwd" etc
+    cp "$shadow" etc
+    cp "$group" etc
+    cp "$sshrc" etc/ssh
 
-	info "3 - Copying binaries"
-	cp -f /lib/ld-linux.so.2 lib 2>/dev/null || cp -f /lib64/ld-linux-x86-64.so.2 lib64
-	cp /lib/x86_64-linux-gnu/libnss* lib/x86_64-linux-gnu
+    info "3 - Copying binaries"
+    cp -f /lib/ld-linux.so.2 lib 2>/dev/null || cp -f /lib64/ld-linux-x86-64.so.2 lib64
+    cp /lib/x86_64-linux-gnu/libnss* lib/x86_64-linux-gnu
 
-	for dbin in /bin/sh /bin/ls /bin/mkdir /bin/cat /bin/rm /bin/sed /usr/bin/rsync /usr/bin/lastlog /usr/bin/touch /usr/sbin/sshd /usr/lib/openssh/sftp-server; do
-		cp -f $dbin ${JAILDIR}/${jail}/$dbin;
-		for lib in $(ldd $dbin | grep -Eo "/.*so.[0-9\.]+"); do
-			cp -p $lib ${JAILDIR}/${jail}/$lib
-		done
-	done
+    for dbin in /bin/sh /bin/ls /bin/mkdir /bin/cat /bin/rm /bin/sed /usr/bin/rsync /usr/bin/lastlog /usr/bin/touch /usr/sbin/sshd /usr/lib/openssh/sftp-server; do
+        cp -f $dbin ${JAILDIR}/${jail}/$dbin;
+        for lib in $(ldd $dbin | grep -Eo "/.*so.[0-9\.]+"); do
+            cp -p $lib ${JAILDIR}/${jail}/$lib
+        done
+    done
 }
 
 ## sub functions : functions call by subcommand
   
 sub_init() {
-	jail=$1
-	sshd_config="${TPLDIR}/sshd_config"
-	inctpl="${TPLDIR}/inc.tpl"
-	[ -f "${LOCALTPLDIR}/sshd_config" ] && sshd_config="${LOCALTPLDIR}/sshd_config"
-	[ -f "${LOCALTPLDIR}/inc.tpl" ] && inctpl="${LOCALTPLDIR}/inc.tpl"
-	check_jail $jail && error "${jail} : trying to create existant jail"
+    jail=$1
+    sshd_config="${TPLDIR}/sshd_config"
+    inctpl="${TPLDIR}/inc.tpl"
+    [ -f "${LOCALTPLDIR}/sshd_config" ] && sshd_config="${LOCALTPLDIR}/sshd_config"
+    [ -f "${LOCALTPLDIR}/inc.tpl" ] && inctpl="${LOCALTPLDIR}/inc.tpl"
+    check_jail $jail && error "${jail} : trying to create existant jail"
 
-	rootdir=$(dirname "$JAILDIR")
-	rootdir_inode=$(stat --format=%i "$rootdir")
-	jaildir_inode=$(stat --format=%i $JAILDIR)
-	if [ "$rootdir_inode" -eq 256 ] || [ "$jaildir_inode" -eq 256 ]; then
-		$BTRFS subvolume create ${JAILDIR}/${jail}
-	else
-		mkdir -p ${JAILDIR}/${jail}
-	fi
-	mk_jail $jail
-	info "4 - Copie default sshd_config"
-	install -m 0640 $sshd_config ${JAILDIR}/$jail/${SSHD_CONFIG}
-	info "5 - Set usable sshd port"
-	set_port $jail auto
-	info "6 - Copie default inc configuration"
-	install -m 0640 $inctpl ${CONFDIR}/$jail
-	notice "${jail} : created jail"
+    rootdir=$(dirname "$JAILDIR")
+    rootdir_inode=$(stat --format=%i "$rootdir")
+    jaildir_inode=$(stat --format=%i $JAILDIR)
+    if [ "$rootdir_inode" -eq 256 ] || [ "$jaildir_inode" -eq 256 ]; then
+        $BTRFS subvolume create ${JAILDIR}/${jail}
+    else
+        mkdir -p ${JAILDIR}/${jail}
+    fi
+    mk_jail $jail
+    info "4 - Copie default sshd_config"
+    install -m 0640 $sshd_config ${JAILDIR}/$jail/${SSHD_CONFIG}
+    info "5 - Set usable sshd port"
+    set_port $jail auto
+    info "6 - Copie default inc configuration"
+    install -m 0640 $inctpl ${CONFDIR}/$jail
+    notice "${jail} : created jail"
 }
 
 sub_update() {
-	jail=$1
-	check_jail $jail || error "${jail} : trying to update inexistant jail"
-	check_jail_on $jail && sub_stop $jail
+    jail=$1
+    check_jail $jail || error "${jail} : trying to update inexistant jail"
+    check_jail_on $jail && sub_stop $jail
 
-	mk_jail $jail
-	notice "${jail} : updated jail"
+    mk_jail $jail
+    notice "${jail} : updated jail"
 }
 
 sub_remove() {
-	jail=$1
-	check_jail $jail || error "${jail} : trying to remove inexistant jail"
+    jail=$1
+    check_jail $jail || error "${jail} : trying to remove inexistant jail"
 
-	check_jail_on $jail && sub_stop $jail
-	
-	rm -f ${CONFDIR}/${jail}
-	jail_inode=$(stat --format=%i ${JAILDIR}/${jail})
-	if [ "$jail_inode" -eq 256 ]; then
-		$BTRFS subvolume delete ${JAILDIR}/${jail} | debug
-	else
-		rm -rf ${JAILDIR}/${jail} | debug
-	fi
-	if [ -d  ${INCDIR}/${jail} ]; then
-		incs=$(ls ${INCDIR}/${jail})
-		for inc in $incs; do
-			inc_inode=$(stat --format=%i ${INCDIR}/${jail}/$inc)
-			if [ "$inc_inode" -eq 256 ]; then
-				$BTRFS subvolume delete ${INCDIR}/${jail}/${inc} | debug
-			else
-				warning "You need to purge ${INCDIR}/${jail}/$inc manually !"
-			fi
-		done
-		rmdir --ignore-fail-on-non-empty ${INCDIR}/${jail} | debug
-	fi
-	set_firewall $jail
+    check_jail_on $jail && sub_stop $jail
+    
+    rm -f ${CONFDIR}/${jail}
+    jail_inode=$(stat --format=%i ${JAILDIR}/${jail})
+    if [ "$jail_inode" -eq 256 ]; then
+        $BTRFS subvolume delete ${JAILDIR}/${jail} | debug
+    else
+        rm -rf ${JAILDIR}/${jail} | debug
+    fi
+    if [ -d  ${INCDIR}/${jail} ]; then
+        incs=$(ls ${INCDIR}/${jail})
+        for inc in $incs; do
+            inc_inode=$(stat --format=%i ${INCDIR}/${jail}/$inc)
+            if [ "$inc_inode" -eq 256 ]; then
+                $BTRFS subvolume delete ${INCDIR}/${jail}/${inc} | debug
+            else
+                warning "You need to purge ${INCDIR}/${jail}/$inc manually !"
+            fi
+        done
+        rmdir --ignore-fail-on-non-empty ${INCDIR}/${jail} | debug
+    fi
+    set_firewall $jail
     notice "${jail} : deleted jail"
 }
 
 sub_start() {
-	jail=$1
-	check_jail $jail || error "${jail} : trying to start inexistant jail"
-	check_jail_on $jail && error "${jail} : trying to start already running jail"
+    jail=$1
+    check_jail $jail || error "${jail} : trying to start inexistant jail"
+    check_jail_on $jail && error "${jail} : trying to start already running jail"
 
-	cd "${JAILDIR}/${jail}"
-	grep -q "${JAILDIR}/${jail}/proc" /proc/mounts || mount -t proc "proc-${jail}" proc
-	grep -q "${JAILDIR}/${jail}/dev" /proc/mounts || mount -nt tmpfs "dev-${jail}" dev
-	[ -e "dev/console" ] || mknod -m 622 dev/console c 5 1
-	[ -e "dev/null" ] || mknod -m 666 dev/null c 1 3
-	[ -e "dev/zero" ] || mknod -m 666 dev/zero c 1 5
-	[ -e "dev/ptmx" ] || mknod -m 666 dev/ptmx c 5 2
-	[ -e "dev/tty" ] || mknod -m 666 dev/tty c 5 0
-	[ -e "dev/random" ] || mknod -m 444 dev/random c 1 8
-	[ -e "dev/urandom" ] || mknod -m 444 dev/urandom c 1 9
-	chown root:tty dev/console dev/ptmx dev/tty
-	ln -fs proc/self/fd dev/fd
-	ln -fs proc/self/fd/0 dev/stdin
-	ln -fs proc/self/fd/1 dev/stdout
-	ln -fs proc/self/fd/2 dev/stderr
-	ln -fs proc/kcore dev/core
-	mkdir -p dev/pts
-	mkdir -p dev/shm
-	grep -q "${JAILDIR}/${jail}/dev/pts" /proc/mounts || mount -t devpts -o gid=4,mode=620 none dev/pts
-	grep -q "${JAILDIR}/${jail}/dev/shm" /proc/mounts || mount -t tmpfs none dev/shm
-	chroot "${JAILDIR}/${jail}" /usr/sbin/sshd -E /var/log/authlog || error "${jail} : error on starting sshd"
+    cd "${JAILDIR}/${jail}"
+    grep -q "${JAILDIR}/${jail}/proc" /proc/mounts || mount -t proc "proc-${jail}" proc
+    grep -q "${JAILDIR}/${jail}/dev" /proc/mounts || mount -nt tmpfs "dev-${jail}" dev
+    [ -e "dev/console" ] || mknod -m 622 dev/console c 5 1
+    [ -e "dev/null" ] || mknod -m 666 dev/null c 1 3
+    [ -e "dev/zero" ] || mknod -m 666 dev/zero c 1 5
+    [ -e "dev/ptmx" ] || mknod -m 666 dev/ptmx c 5 2
+    [ -e "dev/tty" ] || mknod -m 666 dev/tty c 5 0
+    [ -e "dev/random" ] || mknod -m 444 dev/random c 1 8
+    [ -e "dev/urandom" ] || mknod -m 444 dev/urandom c 1 9
+    chown root:tty dev/console dev/ptmx dev/tty
+    ln -fs proc/self/fd dev/fd
+    ln -fs proc/self/fd/0 dev/stdin
+    ln -fs proc/self/fd/1 dev/stdout
+    ln -fs proc/self/fd/2 dev/stderr
+    ln -fs proc/kcore dev/core
+    mkdir -p dev/pts
+    mkdir -p dev/shm
+    grep -q "${JAILDIR}/${jail}/dev/pts" /proc/mounts || mount -t devpts -o gid=4,mode=620 none dev/pts
+    grep -q "${JAILDIR}/${jail}/dev/shm" /proc/mounts || mount -t tmpfs none dev/shm
+    chroot "${JAILDIR}/${jail}" /usr/sbin/sshd -E /var/log/authlog || error "${jail} : error on starting sshd"
     pid=$(cat "${JAILDIR}/${jail}/${SSHD_PID}")
     notice "${jail} was started [${pid}]"
 }
 
 sub_stop() {
-	jail=$1
-	check_jail $jail || error "${jail} : trying to stop inexistant jail"
-	check_jail_on $jail || error "${jail} : trying to stop not running jail"
+    jail=$1
+    check_jail $jail || error "${jail} : trying to stop inexistant jail"
+    check_jail_on $jail || error "${jail} : trying to stop not running jail"
 
-	pid=$(cat ${JAILDIR}/${jail}/${SSHD_PID})
-	for conn in $(ps --ppid $pid -o pid=); do
-		kill $conn
-	done
-	kill $pid && notice "${jail} was stopped [${pid}]"
-	umount --lazy --recursive ${JAILDIR}/${jail}/dev
-	umount --lazy ${JAILDIR}/${jail}/proc/
+    pid=$(cat ${JAILDIR}/${jail}/${SSHD_PID})
+    for conn in $(ps --ppid $pid -o pid=); do
+        kill $conn
+    done
+    kill $pid && notice "${jail} was stopped [${pid}]"
+    umount --lazy --recursive ${JAILDIR}/${jail}/dev
+    umount --lazy ${JAILDIR}/${jail}/proc/
 }
 
 sub_reload() {
-	jail=$1
-	check_jail $jail || error "${jail} : trying to reload inexistant jail"
-	check_jail_on $jail || error "${jail} : trying to reload not running jail"
+    jail=$1
+    check_jail $jail || error "${jail} : trying to reload inexistant jail"
+    check_jail_on $jail || error "${jail} : trying to reload not running jail"
 
     pid=$(cat "${JAILDIR}/${jail}/${SSHD_PID}")
 
-	pkill -HUP "${pid}"
+    pkill -HUP "${pid}"
     notice "${jail} was reloaded [${pid}]"
 }
 
 sub_status() {
-	jail=$1
-	check_jail $jail || error "${jail} : inexistant jail ! Use '$0 status' for list all"
+    jail=$1
+    check_jail $jail || error "${jail} : inexistant jail ! Use '$0 status' for list all"
 
-	inc=$(get_inc $jail)
-	if ( check_jail_on $jail ); then
-		status="ON "
-	else
-		status="OFF"
-	fi
-	port=$(get_port $jail)
-	ip=$(get_ip $jail|xargs|tr -s ' ' ',')
-	echo "$jail $status $port $inc $ip" | awk '{ printf("%- 30s %- 10s %- 10s %- 10s %- 40s\n", $1, $2, $3, $4, $5); }'
+    inc=$(get_inc $jail)
+    if ( check_jail_on $jail ); then
+        status="ON "
+    else
+        status="OFF"
+    fi
+    port=$(get_port $jail)
+    ip=$(get_ip $jail|xargs|tr -s ' ' ',')
+    echo "$jail $status $port $inc $ip" | awk '{ printf("%- 30s %- 10s %- 10s %- 10s %- 40s\n", $1, $2, $3, $4, $5); }'
 }
 
 sub_params() {
-	jail=$1
-	params=$2
-	option=$3
-	check_jail $jail || error "${jail} : inexistant jail'"
+    jail=$1
+    params=$2
+    option=$3
+    check_jail $jail || error "${jail} : inexistant jail'"
 
-	if [ -z "${option}" ]; then
-	        get_${params} $jail
-	else
-	        set_${params} $jail $option
-		notice "${jail} : update $params => $option"
-	fi
+    if [ -z "${option}" ]; then
+        get_${params} $jail
+    else
+        set_${params} $jail $option
+        notice "${jail} : update $params => $option"
+    fi
 }
 
 sub_sync() {
-	jail=$1
+    jail=$1
     check_jail $jail || error "${jail} : trying to sync inexistant jail"
 
-	[ -n "${NODE}" ] || error "Sync need config of \$NODE in /etc/default/bkctld !"
+    [ -n "${NODE}" ] || error "Sync need config of \$NODE in /etc/default/bkctld !"
 
-	jail=$1
-	ssh $NODE bkctld init $jail | debug
-	rsync -a ${JAILDIR}/${jail}/ ${NODE}:${JAILDIR}/${jail}/ --exclude proc/* --exclude sys/* --exclude dev/* --exclude run --exclude var/backup/*
-	rsync -a ${CONFDIR}/$jail ${NODE}:${CONFDIR}/$jail
-	if ( check_jail_on $jail ); then
-		ssh $NODE bkctld start $jail | debug
-	fi
-	if [ -n "${FIREWALL_RULES}" ]; then
-		rsync -a ${FIREWALL_RULES} ${NODE}:${FIREWALL_RULES}
-		ssh $NODE /etc/init.d/minifirewall restart | debug
-	fi
+    jail=$1
+    ssh $NODE bkctld init $jail | debug
+    rsync -a ${JAILDIR}/${jail}/ ${NODE}:${JAILDIR}/${jail}/ --exclude proc/* --exclude sys/* --exclude dev/* --exclude run --exclude var/backup/*
+    rsync -a ${CONFDIR}/$jail ${NODE}:${CONFDIR}/$jail
+    if ( check_jail_on $jail ); then
+        ssh $NODE bkctld start $jail | debug
+    fi
+    if [ -n "${FIREWALL_RULES}" ]; then
+        rsync -a ${FIREWALL_RULES} ${NODE}:${FIREWALL_RULES}
+        ssh $NODE /etc/init.d/minifirewall restart | debug
+    fi
 }
 
 sub_inc() {
-	date=$(date +"%Y-%m-%d-%H")
-	jails=$(ls $JAILDIR)
-	for jail in $jails; do
-		inc="${INCDIR}/${jail}/${date}"
-		mkdir -p ${INCDIR}/${jail}
-		if [ ! -d "${inc}" ]; then
-			start=$(date +"%H:%M:%S")
-			jail_inode=$(stat --format=%i ${JAILDIR}/${jail})
-			if [ "$jail_inode" -eq 256 ]; then
-				$BTRFS subvolume snapshot -r ${JAILDIR}/${jail} $inc | debug
-			else
-				cp -alx ${JAILDIR}/${jail}/ $inc | debug
-			fi
-			end=$(date +"%H:%M:%S")
+    date=$(date +"%Y-%m-%d-%H")
+    jails=$(ls $JAILDIR)
+    for jail in $jails; do
+        inc="${INCDIR}/${jail}/${date}"
+        mkdir -p ${INCDIR}/${jail}
+        if [ ! -d "${inc}" ]; then
+            start=$(date +"%H:%M:%S")
+            jail_inode=$(stat --format=%i ${JAILDIR}/${jail})
+            if [ "$jail_inode" -eq 256 ]; then
+                $BTRFS subvolume snapshot -r ${JAILDIR}/${jail} $inc | debug
+            else
+                cp -alx ${JAILDIR}/${jail}/ $inc | debug
+            fi
+            end=$(date +"%H:%M:%S")
             notice "${jail} : made $date inc [$start/$end]"
-		else
+        else
             warning "${jail} : trying to made already existant inc"
-		fi
-	done
+        fi
+    done
 }
 
 sub_rm() {
-	empty="/tmp/bkctld-${$}-$(date +%N))"
-	mkdir $empty
-	pidfile="/var/run/bkctld-rm.pid"
-	if [ -f "${pidfile}" ]; then
-		pid=$(cat $pidfile)
-		ps -u $pid >/dev/null
-		if [ $? -eq 0 ]; then
-			kill -9 $pid
-			warning "$0 rm always run (PID $pid), killed by $$ !"
-		fi
-		rm $pidfile
+    empty="/tmp/bkctld-${$}-$(date +%N))"
+    mkdir $empty
+    pidfile="/var/run/bkctld-rm.pid"
+    if [ -f "${pidfile}" ]; then
+        pid=$(cat $pidfile)
+        ps -u $pid >/dev/null
+        if [ $? -eq 0 ]; then
+            kill -9 $pid
+            warning "$0 rm always run (PID $pid), killed by $$ !"
         fi
-	echo $$ > $pidfile
-	rms_logs=""
-	jails=$(ls $JAILDIR)
-	for jail in $jails; do
-		incs=$(ls ${INCDIR}/$jail)
-		if [ -f ${CONFDIR}/$jail ]; then
-			keepfile="${CONFDIR}/.keep-${jail}"
-			while read j; do
-			        date=$( echo "$j" | cut -d. -f1 )
-			        before=$( echo "$j" | cut -d. -f2 )
-				date -d "$(date "$date") $before" "+%Y-%m-%d"
-			done < "${CONFDIR}/$jail" > "$keepfile"
-			for j in $(echo "${incs}" | grep -v -f "$keepfile"); do
-				start=$(date +"%H:%M:%S")
-				inc_inode=$(stat --format=%i "${INCDIR}/${jail}/${j}")
-				if [ "$inc_inode" -eq 256 ]; then
-				        $BTRFS subvolume delete "${INCDIR}/${jail}/${j}" | debug
-				else
-				        cd "${INCDIR}/$jail"
-				        rsync -a --delete "$empty/" "$j/"
-				        rmdir "$j"
-				fi
-				end=$(date +"%H:%M:%S")
-				notice "${jail} : deleted $j inc [$start/$end]"
-			done
-		fi
-	done
-	rmdir $empty
-	rm $pidfile
+        rm $pidfile
+        fi
+    echo $$ > $pidfile
+    rms_logs=""
+    jails=$(ls $JAILDIR)
+    for jail in $jails; do
+        incs=$(ls ${INCDIR}/$jail)
+        if [ -f ${CONFDIR}/$jail ]; then
+            keepfile="${CONFDIR}/.keep-${jail}"
+            while read j; do
+                date=$( echo "$j" | cut -d. -f1 )
+                before=$( echo "$j" | cut -d. -f2 )
+                date -d "$(date "$date") $before" "+%Y-%m-%d"
+            done < "${CONFDIR}/$jail" > "$keepfile"
+            for j in $(echo "${incs}" | grep -v -f "$keepfile"); do
+                start=$(date +"%H:%M:%S")
+                inc_inode=$(stat --format=%i "${INCDIR}/${jail}/${j}")
+                if [ "$inc_inode" -eq 256 ]; then
+                    $BTRFS subvolume delete "${INCDIR}/${jail}/${j}" | debug
+                else
+                    cd "${INCDIR}/$jail"
+                    rsync -a --delete "$empty/" "$j/"
+                    rmdir "$j"
+                fi
+                end=$(date +"%H:%M:%S")
+                notice "${jail} : deleted $j inc [$start/$end]"
+            done
+        fi
+    done
+    rmdir $empty
+    rm $pidfile
 }
 
 ## main function : check usage and valid params
 
 main() {
-	[ "$(id -u)" -ne 0 ] && error "You need to be root to run $0 !"
+    [ "$(id -u)" -ne 0 ] && error "You need to be root to run $0 !"
 
-	[ -f /etc/default/bkctld ] && . /etc/default/bkctld
-	[ -z "${CONFDIR}" ] && CONFDIR='/etc/evobackup'
-	[ -z "${JAILDIR}" ] && JAILDIR='/backup/jails'
-	[ -z "${INCDIR}" ] && INCDIR='/backup/incs'
-	[ -z "${TPLDIR}" ] && TPLDIR='/usr/share/bkctld'
-	[ -z "${LOCALTPLDIR}" ] && LOCALTPLDIR='/usr/local/share/bkctld'
-	[ -z "${SSHD_PID}" ] && SSHD_PID='/run/sshd.pid'
-	[ -z "${SSHD_CONFIG}" ] && SSHD_CONFIG='/etc/ssh/sshd_config'
-	[ -z "${AUTHORIZED_KEYS}" ] && AUTHORIZED_KEYS='/root/.ssh/authorized_keys'
+    [ -f /etc/default/bkctld ] && . /etc/default/bkctld
+    [ -z "${CONFDIR}" ] && CONFDIR='/etc/evobackup'
+    [ -z "${JAILDIR}" ] && JAILDIR='/backup/jails'
+    [ -z "${INCDIR}" ] && INCDIR='/backup/incs'
+    [ -z "${TPLDIR}" ] && TPLDIR='/usr/share/bkctld'
+    [ -z "${LOCALTPLDIR}" ] && LOCALTPLDIR='/usr/local/share/bkctld'
+    [ -z "${SSHD_PID}" ] && SSHD_PID='/run/sshd.pid'
+    [ -z "${SSHD_CONFIG}" ] && SSHD_CONFIG='/etc/ssh/sshd_config'
+    [ -z "${AUTHORIZED_KEYS}" ] && AUTHORIZED_KEYS='/root/.ssh/authorized_keys'
     [ -z "${LOGLEVEL}" ] && LOGLEVEL=6
-	BTRFS=$(which btrfs)
-	mkdir -p $CONFDIR $JAILDIR $INCDIR
-	subcommand=$1
-	jail=$2
-	option=$3
-	case $subcommand in
-	    "" | "-h" | "--help")
-	        usage
-	        ;;
-	    "inc" | "rm")
-	        "sub_${subcommand}"
-		;;
+    BTRFS=$(which btrfs)
+    mkdir -p $CONFDIR $JAILDIR $INCDIR
+    subcommand=$1
+    jail=$2
+    option=$3
+    case $subcommand in
+        "" | "-h" | "--help")
+            usage
+            ;;
+        "inc" | "rm")
+            "sub_${subcommand}"
+        ;;
             "init")
-		if [ -n "${jail}" ]; then
-			"sub_${subcommand}" $jail
-		else
-			usage
-		fi
-		;;
-	    "key" | "port" | "ip")
-		if [ -n "${jail}" ]; then
-			sub_params $jail $subcommand $option
-		else
-			usage
-		fi
-		;;
-	    "start" | "stop" | "reload" | "restart" | "sync" | "update" | "remove")
-		if [ -n "${jail}" ]; then
-			if [ "${jail}" = "all" ]; then
-				jails=$(ls $JAILDIR)
-				for jail in $jails; do
-					case $subcommand in
-					    "start")
-						check_jail_on $jail || "sub_${subcommand}" $jail
-						;;
-					    "stop" | "reload")
-						check_jail_on $jail && "sub_${subcommand}" $jail
-						;;
-					    "restart")
-						check_jail_on $jail && sub_stop $jail
-						sub_start $jail
-						;;
-					    *)
-							"sub_${subcommand}" $jail
-						;;
-					esac
-		                done
-			else
-				if [ "${subcommand}" != "restart" ]; then
-					"sub_${subcommand}" $jail
-				else
-					check_jail_on $jail && sub_stop $jail
-					sub_start $jail
-				fi
-			fi
-		else
-			usage
-		fi
-		;;
-	    "status")
-		if [ -z "${jail}" ]; then
-			jails=$(ls $JAILDIR)
-			for jail in $jails; do
+        if [ -n "${jail}" ]; then
+            "sub_${subcommand}" $jail
+        else
+            usage
+        fi
+        ;;
+        "key" | "port" | "ip")
+        if [ -n "${jail}" ]; then
+            sub_params $jail $subcommand $option
+        else
+            usage
+        fi
+        ;;
+        "start" | "stop" | "reload" | "restart" | "sync" | "update" | "remove")
+        if [ -n "${jail}" ]; then
+            if [ "${jail}" = "all" ]; then
+                jails=$(ls $JAILDIR)
+                for jail in $jails; do
+                    case $subcommand in
+                        "start")
+                            check_jail_on $jail || "sub_${subcommand}" $jail
+                        ;;
+                        "stop" | "reload")
+                            check_jail_on $jail && "sub_${subcommand}" $jail
+                        ;;
+                        "restart")
+                            check_jail_on $jail && sub_stop $jail
+                            sub_start $jail
+                        ;;
+                        *)
+                            "sub_${subcommand}" $jail
+                        ;;
+                    esac
+                        done
+            else
+                if [ "${subcommand}" != "restart" ]; then
+                    "sub_${subcommand}" $jail
+                else
+                    check_jail_on $jail && sub_stop $jail
+                    sub_start $jail
+                fi
+            fi
+        else
+            usage
+        fi
+        ;;
+        "status")
+        if [ -z "${jail}" ]; then
+            jails=$(ls $JAILDIR)
+            for jail in $jails; do
                 "sub_${subcommand}" $jail
-	        done
-		else
-			"sub_${subcommand}" $jail
-		fi
-		;;
-	    *)
-	        shift
-	        warning "'${subcommand}' is not a known subcommand." && usage
-	       	exit 1
-	        ;;
-	esac
+            done
+        else
+            "sub_${subcommand}" $jail
+        fi
+        ;;
+        *)
+            shift
+            warning "'${subcommand}' is not a known subcommand." && usage
+            exit 1
+            ;;
+    esac
 }
 
 main "$@"

From fa27759cad1c55ead9a551438174dd1ff89af978 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Tue, 27 Mar 2018 17:11:25 +0200
Subject: [PATCH 16/23] Force variables definition and add a set -u

---
 bkctld | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/bkctld b/bkctld
index 6dde62e..90abd39 100755
--- a/bkctld
+++ b/bkctld
@@ -8,6 +8,8 @@
 # Licence: AGPLv3
 #
 
+set -u
+
 usage(){
     cat <<EOF
 Usage: $0 <subcommand> [options]
@@ -475,21 +477,22 @@ main() {
     [ "$(id -u)" -ne 0 ] && error "You need to be root to run $0 !"
 
     [ -f /etc/default/bkctld ] && . /etc/default/bkctld
-    [ -z "${CONFDIR}" ] && CONFDIR='/etc/evobackup'
-    [ -z "${JAILDIR}" ] && JAILDIR='/backup/jails'
-    [ -z "${INCDIR}" ] && INCDIR='/backup/incs'
-    [ -z "${TPLDIR}" ] && TPLDIR='/usr/share/bkctld'
-    [ -z "${LOCALTPLDIR}" ] && LOCALTPLDIR='/usr/local/share/bkctld'
-    [ -z "${SSHD_PID}" ] && SSHD_PID='/run/sshd.pid'
-    [ -z "${SSHD_CONFIG}" ] && SSHD_CONFIG='/etc/ssh/sshd_config'
-    [ -z "${AUTHORIZED_KEYS}" ] && AUTHORIZED_KEYS='/root/.ssh/authorized_keys'
-    [ -z "${LOGLEVEL}" ] && LOGLEVEL=6
-    BTRFS=$(which btrfs)
-    mkdir -p $CONFDIR $JAILDIR $INCDIR
-    subcommand=$1
-    jail=$2
-    option=$3
-    case $subcommand in
+    CONFDIR="${CONFDIR:-/etc/evobackup}"
+    JAILDIR="${JAILDIR:-/backup/jails}"
+    INCDIR="${INCDIR:-/backup/incs}"
+    TPLDIR="${TPLDIR:-/usr/share/bkctld}"
+    LOCALTPLDIR="${LOCALTPLDIR:-/usr/local/share/bkctld}"
+    SSHD_PID="${SSHD_PID:-/run/sshd.pid}"
+    SSHD_CONFIG="${SSHD_CONFIG:-/etc/ssh/sshd_config}"
+    AUTHORIZED_KEYS="${AUTHORIZED_KEYS:-/root/.ssh/authorized_keys}"
+    FIREWALL_RULES="${FIREWALL_RULES:-}"
+    LOGLEVEL="${LOGLEVEL:-6}"
+    BTRFS=$(command -v btrfs)
+    mkdir -p "${CONFDIR}" "${JAILDIR}" "${INCDIR}"
+    subcommand="${1:-}"
+    jail="${2:-}"
+    option="${3:-}"
+    case "${subcommand}" in
         "" | "-h" | "--help")
             usage
             ;;

From 3c12286704b01939cf98d2d0d048fdf07e1b3760 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Tue, 27 Mar 2018 18:22:31 +0200
Subject: [PATCH 17/23] Double quote all vars and add brackets

---
 bkctld | 359 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 179 insertions(+), 180 deletions(-)

diff --git a/bkctld b/bkctld
index 90abd39..f543abe 100755
--- a/bkctld
+++ b/bkctld
@@ -84,102 +84,102 @@ check_jail() {
 }
 
 check_jail_on() {
-    jail=$1
+    jail="${1}"
     return=1
-    if [ -f ${JAILDIR}/${jail}/${SSHD_PID} ]; then
-        pid=$(cat ${JAILDIR}/${jail}/${SSHD_PID})
-        ps -p $pid > /dev/null && return=0
+    if [ -f "${JAILDIR}/${jail}/${SSHD_PID}" ]; then
+        pid=$(cat "${JAILDIR}/${jail}/${SSHD_PID}")
+        ps -p "${pid}" > /dev/null && return=0
     fi
-    if [ "$return" -eq 1 ]; then
-        rm -f ${JAILDIR}/${jail}/${SSHD_PID}
-        grep -q "${JAILDIR}/${jail}/proc" /proc/mounts && umount --lazy ${JAILDIR}/${jail}/proc/
-        grep -q "${JAILDIR}/${jail}/dev" /proc/mounts && umount --lazy --recursive ${JAILDIR}/${jail}/dev
+    if [ "${return}" -eq 1 ]; then
+        rm -f "${JAILDIR}/${jail}/${SSHD_PID}"
+        grep -q "${JAILDIR}/${jail}/proc" /proc/mounts && umount --lazy "${JAILDIR}/${jail}/proc/"
+        grep -q "${JAILDIR}/${jail}/dev" /proc/mounts && umount --lazy --recursive "${JAILDIR}/${jail}/dev"
     fi
-    return "$return"
+    return "${return}"
 }
 
 ## get functions : get info on jail
 
 get_port() {
-    jail=$1
-    port=$(grep -E "Port [0-9]+" ${JAILDIR}/${jail}/${SSHD_CONFIG}|grep -oE "[0-9]+")
-    echo $port
+    jail="${1}"
+    port=$(grep -E "Port [0-9]+" "${JAILDIR}/${jail}/${SSHD_CONFIG}"|grep -oE "[0-9]+")
+    echo "${port}"
 }
 
 get_key() {
-    jail=$1
-    if [ -f ${JAILDIR}/${jail}/${AUTHORIZED_KEYS} ]; then
-        cat ${JAILDIR}/${jail}/${AUTHORIZED_KEYS}
+    jail="${1}"
+    if [ -f "${JAILDIR}/${jail}/${AUTHORIZED_KEYS}" ]; then
+        cat "${JAILDIR}/${jail}/${AUTHORIZED_KEYS}"
     fi
 }
 
 get_ip() {
-    jail=$1
+    jail="${1}"
     grep -E "^AllowUsers" "${JAILDIR}/$jail/${SSHD_CONFIG}"|grep -Eo "root@[^ ]+"| while read allow; do
-        echo "$allow"|cut -d'@' -f2
+        echo "${allow}"|cut -d'@' -f2
     done
 }
 
 get_inc() {
-    jail=$1
+    jail="${1}"
     inc="0"
-        if [ -f ${CONFDIR}/${jail} ]; then
-            day=$(grep -c "day" ${CONFDIR}/${jail})
-            month=$(grep -c "month" ${CONFDIR}/${jail})
+        if [ -f "${CONFDIR}/${jail}" ]; then
+            day=$(grep -c "day" "${CONFDIR}/${jail}")
+            month=$(grep -c "month" "${CONFDIR}/${jail}")
             inc="${day}/${month}"
         fi
-    echo $inc
+    echo "${inc}"
 }
 
 ## set functions : set info on jail
 
 set_port() {
-    jail=$1
-    port=$2
-    if [ "$port" = "auto" ]; then
-        port=$(grep -h Port ${JAILDIR}/*/${SSHD_CONFIG} 2>/dev/null | grep -Eo "[0-9]+" | sort -n | tail -1)
+    jail="${1}"
+    port="${2}"
+    if [ "${port}" = "auto" ]; then
+        port=$(grep -h Port "${JAILDIR}"/*/"${SSHD_CONFIG}" 2>/dev/null | grep -Eo "[0-9]+" | sort -n | tail -1)
         port=$((port+1))
         [ "${port}" -le 1 ] && port=2222
     fi
-    sed -i "s/^Port .*/Port ${port}/" ${JAILDIR}/$jail/${SSHD_CONFIG}
-    set_firewall $jail
+    sed -i "s/^Port .*/Port ${port}/" "${JAILDIR}/$jail/${SSHD_CONFIG}"
+    set_firewall "${jail}"
 }
 
 set_key() {
-    jail=$1
-    keyfile=$2
-    [ -e "${keyfile}" ] || error "Keyfile $keyfile dosen't exist !"
-    cat $keyfile > ${JAILDIR}/${jail}/${AUTHORIZED_KEYS}
-    chmod 600 ${JAILDIR}/${jail}/${AUTHORIZED_KEYS}
+    jail="${1}"
+    keyfile="${2}"
+    [ -e "${keyfile}" ] || error "Keyfile ${keyfile} dosen't exist !"
+    cat "${keyfile}" > "${JAILDIR}/${jail}/${AUTHORIZED_KEYS}"
+    chmod 600 "${JAILDIR}/${jail}/${AUTHORIZED_KEYS}"
 }
 
 set_ip() {
-    jail=$1
-    ip=$2
-    if [ "$ip" = "all" ] || [ "$ip" = "0.0.0.0/0" ]; then
+    jail="${1}"
+    ip="${2}"
+    if [ "${ip}" = "all" ] || [ "${ip}" = "0.0.0.0/0" ]; then
         ips="0.0.0.0/0"
     else
-        ips=$(get_ip $jail)
-        ips=$(echo $ips $ip|xargs -n1|grep -v "0.0.0.0/0"|sort|uniq)
+        ips=$(get_ip "${jail}")
+        ips=$(echo "${ips}" "${ip}"|xargs -n1|grep -v "0.0.0.0/0"|sort|uniq)
     fi
     allow="AllowUsers"
     for ip in $ips; do
-        allow="$allow root@${ip}"
+        allow="${allow} root@${ip}"
     done
-    sed -i "s~^AllowUsers .*~${allow}~" ${JAILDIR}/$jail/${SSHD_CONFIG}
-    set_firewall $jail
+    sed -i "s~^AllowUsers .*~${allow}~" "${JAILDIR}/$jail/${SSHD_CONFIG}"
+    set_firewall "${jail}"
 }
 
 set_firewall() {
-    jail=$1
+    jail="${1}"
     if [ -n "${FIREWALL_RULES}" ]; then
-        if [ -f $FIREWALL_RULES ]; then
-            sed -i "/#${jail}$/d" $FIREWALL_RULES
+        if [ -f "${FIREWALL_RULES}" ]; then
+            sed -i "/#${jail}$/d" "${FIREWALL_RULES}"
         fi
-        if ( check_jail $jail ); then
-            port=$(get_port $jail)
-            for ip in $(get_ip $jail); do
-                echo "/sbin/iptables -A INPUT -p tcp --sport 1024: --dport $port -s $ip -j ACCEPT #$jail" >> $FIREWALL_RULES
+        if ( check_jail "${jail}" ); then
+            port=$(get_port "${jail}")
+            for ip in $(get_ip "${jail}"); do
+                echo "/sbin/iptables -A INPUT -p tcp --sport 1024: --dport ${port} -s ${ip} -j ACCEPT #${jail}" >> "${FIREWALL_RULES}"
             done
             if [ -f /etc/init.d/minifirewall ]; then
                 /etc/init.d/minifirewall restart >/dev/null
@@ -191,7 +191,7 @@ set_firewall() {
 ## mk_jail function : create or update a jail
 
 mk_jail() {
-    jail=$1
+    jail="${1}"
     passwd="${TPLDIR}/passwd"
     shadow="${TPLDIR}/shadow"
     group="${TPLDIR}/group"
@@ -219,19 +219,19 @@ mk_jail() {
     [ -f /etc/ssh/ssh_host_rsa_key ] && cp /etc/ssh/ssh_host_rsa_key etc/ssh
     [ -f /etc/ssh/ssh_host_ecdsa_key ] && cp /etc/ssh/ssh_host_ecdsa_key etc/ssh
     [ -f /etc/ssh/ssh_host_ed25519_key ] && cp /etc/ssh/ssh_host_ed25519_key etc/ssh
-    cp "$passwd" etc
-    cp "$shadow" etc
-    cp "$group" etc
-    cp "$sshrc" etc/ssh
+    cp "${passwd}" etc
+    cp "${shadow}" etc
+    cp "${group}" etc
+    cp "${sshrc}" etc/ssh
 
     info "3 - Copying binaries"
     cp -f /lib/ld-linux.so.2 lib 2>/dev/null || cp -f /lib64/ld-linux-x86-64.so.2 lib64
     cp /lib/x86_64-linux-gnu/libnss* lib/x86_64-linux-gnu
 
     for dbin in /bin/sh /bin/ls /bin/mkdir /bin/cat /bin/rm /bin/sed /usr/bin/rsync /usr/bin/lastlog /usr/bin/touch /usr/sbin/sshd /usr/lib/openssh/sftp-server; do
-        cp -f $dbin ${JAILDIR}/${jail}/$dbin;
-        for lib in $(ldd $dbin | grep -Eo "/.*so.[0-9\.]+"); do
-            cp -p $lib ${JAILDIR}/${jail}/$lib
+        cp -f "${dbin}" "${JAILDIR}/${jail}/${dbin}";
+        for lib in $(ldd "${dbin}" | grep -Eo "/.*so.[0-9\.]+"); do
+            cp -p "${lib}" "${JAILDIR}/${jail}/${lib}"
         done
     done
 }
@@ -239,73 +239,73 @@ mk_jail() {
 ## sub functions : functions call by subcommand
   
 sub_init() {
-    jail=$1
+    jail="${1}"
     sshd_config="${TPLDIR}/sshd_config"
     inctpl="${TPLDIR}/inc.tpl"
     [ -f "${LOCALTPLDIR}/sshd_config" ] && sshd_config="${LOCALTPLDIR}/sshd_config"
     [ -f "${LOCALTPLDIR}/inc.tpl" ] && inctpl="${LOCALTPLDIR}/inc.tpl"
-    check_jail $jail && error "${jail} : trying to create existant jail"
+    check_jail "${jail}" && error "${jail} : trying to create existant jail"
 
-    rootdir=$(dirname "$JAILDIR")
-    rootdir_inode=$(stat --format=%i "$rootdir")
-    jaildir_inode=$(stat --format=%i $JAILDIR)
-    if [ "$rootdir_inode" -eq 256 ] || [ "$jaildir_inode" -eq 256 ]; then
-        $BTRFS subvolume create ${JAILDIR}/${jail}
+    rootdir=$(dirname "${JAILDIR}")
+    rootdir_inode=$(stat --format=%i "${rootdir}")
+    jaildir_inode=$(stat --format=%i "${JAILDIR}")
+    if [ "${rootdir_inode}" -eq 256 ] || [ "${jaildir_inode}" -eq 256 ]; then
+        "${BTRFS}" subvolume create "${JAILDIR}/${jail}"
     else
-        mkdir -p ${JAILDIR}/${jail}
+        mkdir -p "${JAILDIR}/${jail}"
     fi
-    mk_jail $jail
+    mk_jail "${jail}"
     info "4 - Copie default sshd_config"
-    install -m 0640 $sshd_config ${JAILDIR}/$jail/${SSHD_CONFIG}
+    install -m 0640 "${sshd_config}" "${JAILDIR}/${jail}/${SSHD_CONFIG}"
     info "5 - Set usable sshd port"
-    set_port $jail auto
+    set_port "${jail}" auto
     info "6 - Copie default inc configuration"
-    install -m 0640 $inctpl ${CONFDIR}/$jail
+    install -m 0640 "${inctpl}" "${CONFDIR}/${jail}"
     notice "${jail} : created jail"
 }
 
 sub_update() {
-    jail=$1
-    check_jail $jail || error "${jail} : trying to update inexistant jail"
-    check_jail_on $jail && sub_stop $jail
+    jail="${1}"
+    check_jail "${jail}" || error "${jail} : trying to update inexistant jail"
+    check_jail_on "${jail}" && sub_stop "${jail}"
 
-    mk_jail $jail
+    mk_jail "${jail}"
     notice "${jail} : updated jail"
 }
 
 sub_remove() {
-    jail=$1
-    check_jail $jail || error "${jail} : trying to remove inexistant jail"
+    jail="${1}"
+    check_jail "${jail}" || error "${jail} : trying to remove inexistant jail"
 
-    check_jail_on $jail && sub_stop $jail
+    check_jail_on "${jail}" && sub_stop "${jail}"
     
-    rm -f ${CONFDIR}/${jail}
-    jail_inode=$(stat --format=%i ${JAILDIR}/${jail})
-    if [ "$jail_inode" -eq 256 ]; then
-        $BTRFS subvolume delete ${JAILDIR}/${jail} | debug
+    rm -f "${CONFDIR}/${jail}"
+    jail_inode=$(stat --format=%i "${JAILDIR}/${jail}")
+    if [ "${jail_inode}" -eq 256 ]; then
+        "${BTRFS}" subvolume delete "${JAILDIR}/${jail}" | debug
     else
-        rm -rf ${JAILDIR}/${jail} | debug
+        rm -rf "${JAILDIR}/${jail}" | debug
     fi
-    if [ -d  ${INCDIR}/${jail} ]; then
-        incs=$(ls ${INCDIR}/${jail})
-        for inc in $incs; do
-            inc_inode=$(stat --format=%i ${INCDIR}/${jail}/$inc)
-            if [ "$inc_inode" -eq 256 ]; then
-                $BTRFS subvolume delete ${INCDIR}/${jail}/${inc} | debug
+    if [ -d  "${INCDIR}/${jail}" ]; then
+        incs=$(ls "${INCDIR}/${jail}")
+        for inc in ${incs}; do
+            inc_inode=$(stat --format=%i "${INCDIR}/${jail}/${inc}")
+            if [ "${inc_inode}" -eq 256 ]; then
+                "${BTRFS}" subvolume delete "${INCDIR}/${jail}/${inc}" | debug
             else
-                warning "You need to purge ${INCDIR}/${jail}/$inc manually !"
+                warning "You need to purge ${INCDIR}/${jail}/${inc} manually !"
             fi
         done
-        rmdir --ignore-fail-on-non-empty ${INCDIR}/${jail} | debug
+        rmdir --ignore-fail-on-non-empty "${INCDIR}/${jail}" | debug
     fi
-    set_firewall $jail
+    set_firewall "${jail}"
     notice "${jail} : deleted jail"
 }
 
 sub_start() {
-    jail=$1
-    check_jail $jail || error "${jail} : trying to start inexistant jail"
-    check_jail_on $jail && error "${jail} : trying to start already running jail"
+    jail="${1}"
+    check_jail "${jail}" || error "${jail} : trying to start inexistant jail"
+    check_jail_on "${jail}" && error "${jail} : trying to start already running jail"
 
     cd "${JAILDIR}/${jail}"
     grep -q "${JAILDIR}/${jail}/proc" /proc/mounts || mount -t proc "proc-${jail}" proc
@@ -333,23 +333,23 @@ sub_start() {
 }
 
 sub_stop() {
-    jail=$1
-    check_jail $jail || error "${jail} : trying to stop inexistant jail"
-    check_jail_on $jail || error "${jail} : trying to stop not running jail"
+    jail="${1}"
+    check_jail "${jail}" || error "${jail} : trying to stop inexistant jail"
+    check_jail_on "${jail}" || error "${jail} : trying to stop not running jail"
 
-    pid=$(cat ${JAILDIR}/${jail}/${SSHD_PID})
-    for conn in $(ps --ppid $pid -o pid=); do
-        kill $conn
+    pid=$(cat "${JAILDIR}/${jail}/${SSHD_PID}")
+    for conn in $(ps --ppid "${pid}" -o pid=); do
+        kill "${conn}"
     done
-    kill $pid && notice "${jail} was stopped [${pid}]"
-    umount --lazy --recursive ${JAILDIR}/${jail}/dev
-    umount --lazy ${JAILDIR}/${jail}/proc/
+    kill "${pid}" && notice "${jail} was stopped [${pid}]"
+    umount --lazy --recursive "${JAILDIR}/${jail}/dev"
+    umount --lazy "${JAILDIR}/${jail}/proc/"
 }
 
 sub_reload() {
-    jail=$1
-    check_jail $jail || error "${jail} : trying to reload inexistant jail"
-    check_jail_on $jail || error "${jail} : trying to reload not running jail"
+    jail="${1}"
+    check_jail "${jail}" || error "${jail} : trying to reload inexistant jail"
+    check_jail_on "${jail}" || error "${jail} : trying to reload not running jail"
 
     pid=$(cat "${JAILDIR}/${jail}/${SSHD_PID}")
 
@@ -358,69 +358,69 @@ sub_reload() {
 }
 
 sub_status() {
-    jail=$1
-    check_jail $jail || error "${jail} : inexistant jail ! Use '$0 status' for list all"
+    jail="${1}"
+    check_jail "${jail}" || error "${jail} : inexistant jail ! Use '$0 status' for list all"
 
-    inc=$(get_inc $jail)
-    if ( check_jail_on $jail ); then
+    inc=$(get_inc "${jail}")
+    if ( check_jail_on "${jail}" ); then
         status="ON "
     else
         status="OFF"
     fi
-    port=$(get_port $jail)
-    ip=$(get_ip $jail|xargs|tr -s ' ' ',')
-    echo "$jail $status $port $inc $ip" | awk '{ printf("%- 30s %- 10s %- 10s %- 10s %- 40s\n", $1, $2, $3, $4, $5); }'
+    port=$(get_port "${jail}")
+    ip=$(get_ip "${jail}"|xargs|tr -s ' ' ',')
+    echo "${jail} ${status} ${port} ${inc} ${ip}" | awk '{ printf("%- 30s %- 10s %- 10s %- 10s %- 40s\n", $1, $2, $3, $4, $5); }'
 }
 
 sub_params() {
-    jail=$1
-    params=$2
-    option=$3
-    check_jail $jail || error "${jail} : inexistant jail'"
+    jail="${1}"
+    params="${2}"
+    option="${3}"
+    check_jail "${jail}" || error "${jail} : inexistant jail'"
 
     if [ -z "${option}" ]; then
-        get_${params} $jail
+        "get_${params}" "${jail}"
     else
-        set_${params} $jail $option
-        notice "${jail} : update $params => $option"
+        "set_${params}" "${jail}" "${option}"
+        notice "${jail} : update ${params} => ${option}"
     fi
 }
 
 sub_sync() {
-    jail=$1
-    check_jail $jail || error "${jail} : trying to sync inexistant jail"
+    jail="${1}"
+    check_jail "${jail}" || error "${jail} : trying to sync inexistant jail"
 
     [ -n "${NODE}" ] || error "Sync need config of \$NODE in /etc/default/bkctld !"
 
-    jail=$1
-    ssh $NODE bkctld init $jail | debug
-    rsync -a ${JAILDIR}/${jail}/ ${NODE}:${JAILDIR}/${jail}/ --exclude proc/* --exclude sys/* --exclude dev/* --exclude run --exclude var/backup/*
-    rsync -a ${CONFDIR}/$jail ${NODE}:${CONFDIR}/$jail
-    if ( check_jail_on $jail ); then
-        ssh $NODE bkctld start $jail | debug
+    jail="${1}"
+    ssh "${NODE}" bkctld init "${jail}" | debug
+    rsync -a "${JAILDIR}/${jail}/" "${NODE}:${JAILDIR}/${jail}/" --exclude proc/* --exclude sys/* --exclude dev/* --exclude run --exclude var/backup/*
+    rsync -a "${CONFDIR}/${jail}" "${NODE}:${CONFDIR}/${jail}"
+    if ( check_jail_on "${jail}" ); then
+        ssh "${NODE}" bkctld start "${jail}" | debug
     fi
     if [ -n "${FIREWALL_RULES}" ]; then
-        rsync -a ${FIREWALL_RULES} ${NODE}:${FIREWALL_RULES}
-        ssh $NODE /etc/init.d/minifirewall restart | debug
+        rsync -a "${FIREWALL_RULES}" "${NODE}:${FIREWALL_RULES}"
+        ssh "${NODE}" /etc/init.d/minifirewall restart | debug
     fi
 }
 
 sub_inc() {
     date=$(date +"%Y-%m-%d-%H")
-    jails=$(ls $JAILDIR)
-    for jail in $jails; do
+    jails=$(ls "${JAILDIR}")
+    for jail in ${jails}; do
         inc="${INCDIR}/${jail}/${date}"
-        mkdir -p ${INCDIR}/${jail}
+        mkdir -p "${INCDIR}/${jail}"
         if [ ! -d "${inc}" ]; then
             start=$(date +"%H:%M:%S")
-            jail_inode=$(stat --format=%i ${JAILDIR}/${jail})
+            jail_inode=$(stat --format=%i "${JAILDIR}/${jail}")
             if [ "$jail_inode" -eq 256 ]; then
-                $BTRFS subvolume snapshot -r ${JAILDIR}/${jail} $inc | debug
+                "${BTRFS}" subvolume snapshot -r "${JAILDIR}/${jail}" "${inc}" | debug
             else
-                cp -alx ${JAILDIR}/${jail}/ $inc | debug
+                cp -alx "${JAILDIR}/${jail}/" "${inc}" | debug
             fi
             end=$(date +"%H:%M:%S")
-            notice "${jail} : made $date inc [$start/$end]"
+            notice "${jail} : made ${date} inc [${start}/${end}]"
         else
             warning "${jail} : trying to made already existant inc"
         fi
@@ -429,52 +429,51 @@ sub_inc() {
 
 sub_rm() {
     empty="/tmp/bkctld-${$}-$(date +%N))"
-    mkdir $empty
+    mkdir "${empty}"
     pidfile="/var/run/bkctld-rm.pid"
     if [ -f "${pidfile}" ]; then
-        pid=$(cat $pidfile)
-        ps -u $pid >/dev/null
-        if [ $? -eq 0 ]; then
-            kill -9 $pid
-            warning "$0 rm always run (PID $pid), killed by $$ !"
+        pid=$(cat "${pidfile}")
+        ps -u "${pid}" >/dev/null
+        if [ "${?}" -eq 0 ]; then
+            kill -9 "${pid}"
+            warning "${0} rm always run (PID ${pid}), killed by ${$} !"
         fi
-        rm $pidfile
+        rm "${pidfile}"
         fi
-    echo $$ > $pidfile
-    rms_logs=""
-    jails=$(ls $JAILDIR)
-    for jail in $jails; do
-        incs=$(ls ${INCDIR}/$jail)
-        if [ -f ${CONFDIR}/$jail ]; then
+    echo "${$}" > "${pidfile}"
+    jails=$(ls "${JAILDIR}")
+    for jail in ${jails}; do
+        incs=$(ls "${INCDIR}/${jail}")
+        if [ -f "${CONFDIR}/${jail}" ]; then
             keepfile="${CONFDIR}/.keep-${jail}"
             while read j; do
-                date=$( echo "$j" | cut -d. -f1 )
-                before=$( echo "$j" | cut -d. -f2 )
-                date -d "$(date "$date") $before" "+%Y-%m-%d"
-            done < "${CONFDIR}/$jail" > "$keepfile"
-            for j in $(echo "${incs}" | grep -v -f "$keepfile"); do
+                date=$( echo "${j}" | cut -d. -f1 )
+                before=$( echo "${j}" | cut -d. -f2 )
+                date -d "$(date "${date}") ${before}" "+%Y-%m-%d"
+            done < "${CONFDIR}/${jail}" > "${keepfile}"
+            for j in $(echo "${incs}" | grep -v -f "${keepfile}"); do
                 start=$(date +"%H:%M:%S")
                 inc_inode=$(stat --format=%i "${INCDIR}/${jail}/${j}")
-                if [ "$inc_inode" -eq 256 ]; then
-                    $BTRFS subvolume delete "${INCDIR}/${jail}/${j}" | debug
+                if [ "${inc_inode}" -eq 256 ]; then
+                    "${BTRFS}" subvolume delete "${INCDIR}/${jail}/${j}" | debug
                 else
-                    cd "${INCDIR}/$jail"
-                    rsync -a --delete "$empty/" "$j/"
-                    rmdir "$j"
+                    cd "${INCDIR}/${jail}"
+                    rsync -a --delete "${empty}/" "${j}/"
+                    rmdir "${j}"
                 fi
                 end=$(date +"%H:%M:%S")
-                notice "${jail} : deleted $j inc [$start/$end]"
+                notice "${jail} : deleted ${j} inc [${start}/${end}]"
             done
         fi
     done
-    rmdir $empty
-    rm $pidfile
+    rmdir "${empty}"
+    rm "${pidfile}"
 }
 
 ## main function : check usage and valid params
 
 main() {
-    [ "$(id -u)" -ne 0 ] && error "You need to be root to run $0 !"
+    [ "$(id -u)" -ne 0 ] && error "You need to be root to run ${0} !"
 
     [ -f /etc/default/bkctld ] && . /etc/default/bkctld
     CONFDIR="${CONFDIR:-/etc/evobackup}"
@@ -501,14 +500,14 @@ main() {
         ;;
             "init")
         if [ -n "${jail}" ]; then
-            "sub_${subcommand}" $jail
+            "sub_${subcommand}" "${jail}"
         else
             usage
         fi
         ;;
         "key" | "port" | "ip")
         if [ -n "${jail}" ]; then
-            sub_params $jail $subcommand $option
+            sub_params "${jail}" "${subcommand}" "${option}"
         else
             usage
         fi
@@ -516,30 +515,30 @@ main() {
         "start" | "stop" | "reload" | "restart" | "sync" | "update" | "remove")
         if [ -n "${jail}" ]; then
             if [ "${jail}" = "all" ]; then
-                jails=$(ls $JAILDIR)
-                for jail in $jails; do
-                    case $subcommand in
+                jails=$(ls "${JAILDIR}")
+                for jail in ${jails}; do
+                    case "${subcommand}" in
                         "start")
-                            check_jail_on $jail || "sub_${subcommand}" $jail
+                            check_jail_on "${jail}" || "sub_${subcommand}" "${jail}"
                         ;;
                         "stop" | "reload")
-                            check_jail_on $jail && "sub_${subcommand}" $jail
+                            check_jail_on "${jail}" && "sub_${subcommand}" "${jail}"
                         ;;
                         "restart")
-                            check_jail_on $jail && sub_stop $jail
-                            sub_start $jail
+                            check_jail_on "${jail}" && sub_stop "${jail}"
+                            sub_start "${jail}"
                         ;;
                         *)
-                            "sub_${subcommand}" $jail
+                            "sub_${subcommand}" "${jail}"
                         ;;
                     esac
                         done
             else
                 if [ "${subcommand}" != "restart" ]; then
-                    "sub_${subcommand}" $jail
+                    "sub_${subcommand}" "${jail}"
                 else
-                    check_jail_on $jail && sub_stop $jail
-                    sub_start $jail
+                    check_jail_on "${jail}" && sub_stop "${jail}"
+                    sub_start "${jail}"
                 fi
             fi
         else
@@ -548,12 +547,12 @@ main() {
         ;;
         "status")
         if [ -z "${jail}" ]; then
-            jails=$(ls $JAILDIR)
-            for jail in $jails; do
-                "sub_${subcommand}" $jail
+            jails=$(ls "${JAILDIR}")
+            for jail in ${jails}; do
+                "sub_${subcommand}" "${jail}"
             done
         else
-            "sub_${subcommand}" $jail
+            "sub_${subcommand}" "${jail}"
         fi
         ;;
         *)
@@ -564,4 +563,4 @@ main() {
     esac
 }
 
-main "$@"
+main "${@}"

From 685b70b63203bd3639b5d2b65468adbe1a3c0fe5 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Tue, 27 Mar 2018 18:35:06 +0200
Subject: [PATCH 18/23] Fix reload

---
 bkctld | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bkctld b/bkctld
index f543abe..01842d5 100755
--- a/bkctld
+++ b/bkctld
@@ -353,8 +353,7 @@ sub_reload() {
 
     pid=$(cat "${JAILDIR}/${jail}/${SSHD_PID}")
 
-    pkill -HUP "${pid}"
-    notice "${jail} was reloaded [${pid}]"
+    kill -HUP "${pid}" && notice "${jail} was reloaded [${pid}]"
 }
 
 sub_status() {

From 2893953ec030e767eb3ab1f8c16ec808793f0120 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Wed, 28 Mar 2018 14:09:22 +0200
Subject: [PATCH 19/23] Reload when update params

---
 bkctld | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bkctld b/bkctld
index 01842d5..813699e 100755
--- a/bkctld
+++ b/bkctld
@@ -381,6 +381,7 @@ sub_params() {
         "get_${params}" "${jail}"
     else
         "set_${params}" "${jail}" "${option}"
+        check_jail_on "${jail}" && sub_reload "${jail}"
         notice "${jail} : update ${params} => ${option}"
     fi
 }

From d27bbbc0f51efa499accb44a729ae5844cc365f1 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Wed, 28 Mar 2018 15:11:49 +0200
Subject: [PATCH 20/23] Rewrite bats tests

---
 test/main.bats | 131 ++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 108 insertions(+), 23 deletions(-)

diff --git a/test/main.bats b/test/main.bats
index 1507615..ee3e70e 100755
--- a/test/main.bats
+++ b/test/main.bats
@@ -2,47 +2,132 @@
 
 setup() {
     port=$(awk -v min=2222 -v max=2999 'BEGIN{srand(); print int(min+rand()*(max-min+1))}')
+    date=$(date +"%Y-%m-%d-%H")
+    inode=$(stat --format=%i /backup)
     rm -f /root/bkctld.key* && ssh-keygen -t rsa -N "" -f /root/bkctld.key -q
-    bkctld init test
-    bkctld port test "${port}"
-    bkctld key test /root/bkctld.key.pub
-    bkctld start test
-    bpid=$(cat /backup/jails/test/run/sshd.pid)
-    bkctld restart test
-    apid=$(cat /backup/jails/test/run/sshd.pid)
-    bkctld inc
+    [ -f /etc/default/bkctld ] && . /etc/default/bkctld
+    CONFDIR="${CONFDIR:-/etc/evobackup}"
+    JAILDIR="${JAILDIR:-/backup/jails}"
+    INCDIR="${INCDIR:-/backup/incs}"
+    TPLDIR="${TPLDIR:-/usr/share/bkctld}"
+    LOCALTPLDIR="${LOCALTPLDIR:-/usr/local/share/bkctld}"
+    SSHD_PID="${SSHD_PID:-/run/sshd.pid}"
+    SSHD_CONFIG="${SSHD_CONFIG:-/etc/ssh/sshd_config}"
+    AUTHORIZED_KEYS="${AUTHORIZED_KEYS:-/root/.ssh/authorized_keys}"
+    FIREWALL_RULES="${FIREWALL_RULES:-}"
+    LOGLEVEL="${LOGLEVEL:-6}"
 }
 
 teardown() {
-    bkctld remove test
+    bkctld remove all && rm -rf "${INCDIR}/*"
 }
 
-@test "port" {
-    run nc -vz 127.0.0.1 "${port}"
-    [ "$status" -eq 0 ]
+@test "init" {
+    bkctld init test
+    if [ "${inode}" -eq 256 ]; then
+        run stat --format=%i "${JAILDIR}/test"
+        [ "${output}" -eq 256 ]
+    else
+        run test -d "${JAILDIR}/test"
+        [ "${status}" -eq 0 ]
+    fi
+}
+
+@test "update" {
+    skip
+}
+
+@test "start" {
+    bkctld init test
+    bkctld start test
+    pid=$(cat "${JAILDIR}/test/${SSHD_PID}")
+    run ps --pid "${pid}"
+    [ "${status}" -eq 0 ]
+}
+
+@test "stop" {
+    bkctld init test
+    bkctld start test
+    pid=$(cat "${JAILDIR}/test/${SSHD_PID}")
+    bkctld stop test
+    run ps --pid "${pid}"
+    [ "${status}" -ne 0 ]
+}
+
+@test "reload" {
+    bkctld init test
+    bkctld start test
+    bkctld reload test
+    run grep "Received SIGHUP; restarting." "${JAILDIR}/test/var/log/authlog"
+    [ "${status}" -eq 0 ]
+}
+
+@test "restart" {
+    bkctld init test
+    bkctld start test
+    bpid=$(cat "${JAILDIR}/test/${SSHD_PID}")
+    bkctld restart test
+    apid=$(cat "${JAILDIR}/test/${SSHD_PID}")
+    [ "${bpid}" -ne "${apid}" ]
+}
+
+@test "status" {
+    bkctld init test
+    run bkctld status test
+    [ "${status}" -eq 0 ]
 }
 
 @test "key" {
+    bkctld init test
+    bkctld start test
+    bkctld key test /root/bkctld.key.pub
     run cat /backup/jails/test/root/.ssh/authorized_keys
-    [ "$status" -eq 0 ]
-    [ "$output" = $(cat /root/bkctld.key.pub) ]
+    [ "${status}" -eq 0 ]
+    [ "${output}" = $(cat /root/bkctld.key.pub) ]
+}
+
+@test "port" {
+    bkctld init test
+    bkctld start test
+    bkctld port test "${port}"
+    run nc -vz 127.0.0.1 "${port}"
+    [ "${status}" -eq 0 ]
+}
+
+@test "ip" {
+    skip
+}
+
+@test "inc" {
+    bkctld init test
+    bkctld inc
+    if [ "${inode}" -eq 256 ]; then
+        run stat --format=%i "${INCDIR}/test/${date}"
+        [ "${output}" -eq 256 ]
+    else
+        run test -d "${INCDIR}/test/${date}"
+        [ "${status}" -eq 0 ]
+    fi
+}
+
+@test "rm" {
+    skip
 }
 
 @test "ssh" {
+    bkctld init test
+    bkctld start test
+    bkctld port test "${port}"
+    bkctld key test /root/bkctld.key.pub
     run ssh -p "${port}" -i /root/bkctld.key -oStrictHostKeyChecking=no root@127.0.0.1 ls
     [ "$status" -eq 0 ]
 }
 
 @test "rsync" {
+    bkctld init test
+    bkctld start test
+    bkctld port test "${port}"
+    bkctld key test /root/bkctld.key.pub
     run rsync -a -e "ssh -p ${port} -i /root/bkctld.key -oStrictHostKeyChecking=no" /tmp/ root@127.0.0.1:/var/backup/
     [ "$status" -eq 0 ]
 }
-
-@test "restart" {
-    [ "${bpid}" -ne "${apid}" ]
-}
-
-@test "inc" {
-    run ls /backup/incs/test/*
-    [ "$status" -eq 0 ]
-}

From 7a9e4c61682607acd40456ac1b05de8188ab313e Mon Sep 17 00:00:00 2001
From: Alexis Ben Miloud--Josselin <abenmiloud+git@evolix.fr>
Date: Thu, 5 Apr 2018 16:02:07 +0200
Subject: [PATCH 21/23] Simplify and store deletion logs in /tmp

---
 zzz_evobackup | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/zzz_evobackup b/zzz_evobackup
index 4f9e3f8..7dd5d09 100755
--- a/zzz_evobackup
+++ b/zzz_evobackup
@@ -122,12 +122,9 @@ mkdir -p -m 700 /home/backup
 # cp /var/lib/redis/dump.rdb /home/backup/
 
 ## ElasticSearch : example with rsync (warning: don't forget to use NFS if you have a cluster)
-# DATE=$(date +%F)
-# curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot_${DATE}?wait_for_completion=true" -o /tmp/es_snapshot_${DATE}.log
-# for i in $(curl -s -XGET "localhost:9200/_snapshot/snaprepo/_all?pretty=true" | grep '^ *"snapshot" : "snapshot_.*",$' | cut -d_ -f2 | sed 's/",$//' | head -n-10); do
-#     curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/snapshot_${i}"
-#     rm /tmp/es_snapshot_${i}.log
-# done
+## Here we have one snapshot a day.
+# curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/snapshot.daily" -o /tmp/es_delete_snapshot.daily.log
+# curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot.daily?wait_for_completion=true" -o /tmp/es_snapshot.daily.log
 
 ## RabbitMQ : export config
 #rabbitmqadmin export /home/backup/rabbitmq.config >> /var/log/evobackup.log

From bc1012b091eb18dbca2795eac66fc7f04647e301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= <bserie@evolix.fr>
Date: Thu, 5 Apr 2018 16:24:18 +0200
Subject: [PATCH 22/23] Modification commentaire

---
 zzz_evobackup | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/zzz_evobackup b/zzz_evobackup
index 7dd5d09..a6ef7dc 100755
--- a/zzz_evobackup
+++ b/zzz_evobackup
@@ -121,8 +121,9 @@ mkdir -p -m 700 /home/backup
 ## Redis : example with copy .rdb file
 # cp /var/lib/redis/dump.rdb /home/backup/
 
-## ElasticSearch : example with rsync (warning: don't forget to use NFS if you have a cluster)
-## Here we have one snapshot a day.
+## ElasticSearch, take a snapshot as a backup.
+## Warning: You need to have a path.repo configured.
+## See: https://wiki.evolix.org/HowtoElasticsearch#snapshots-et-sauvegardes
 # curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/snapshot.daily" -o /tmp/es_delete_snapshot.daily.log
 # curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot.daily?wait_for_completion=true" -o /tmp/es_snapshot.daily.log
 

From 776a4b8638fc9791d6996b81ccf6ee34265598be Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Tue, 29 May 2018 18:05:07 +0200
Subject: [PATCH 23/23] Convert bkctld man page in a markdown file

---
 README.md     |   6 +-
 docs/bkctld.8 | 280 --------------------------------------------------
 docs/usage.md | 232 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 237 insertions(+), 281 deletions(-)
 delete mode 100644 docs/bkctld.8
 create mode 100644 docs/usage.md

diff --git a/README.md b/README.md
index 81074a9..e6a84ca 100644
--- a/README.md
+++ b/README.md
@@ -93,8 +93,12 @@ vagrant provision --provision-with test
 
 ## Usage
 
+See [docs/usage.md](docs/usage.md).
+
+Man page, in roff language, can be generated with pandoc :
+
 ~~~
-man bkctld
+pandoc -f markdown -t man usage.md --template default.man -V title=bkctld -V section=8 -V date="$(date '+%d %b %Y')" -V footer="$(git describe --tags)" -V header="bkctld man page" -V author="$(git shortlog -sne|awk '{ $1 = "" } sub(FS,"\n")')"
 ~~~
 
 #### Client configuration
diff --git a/docs/bkctld.8 b/docs/bkctld.8
deleted file mode 100644
index 009d4d6..0000000
--- a/docs/bkctld.8
+++ /dev/null
@@ -1,280 +0,0 @@
-.\" Manpage for bkctld.
-.\" Contact vlaborie@evolix.fr to correct errors or typos.
-.TH man 8 "24 Mars 2017" "1.4" "bkctld man page"
-.SH NAME
-bkctld - tool to manage evobackup jail
-.SH SYNOPSIS
-bkctld <command> [<args>]
-.SH DESCRIPTION
-bkctld is a shell script used to set up and manage a backup server able to receive data from many servers (clients).
-.PP
-The aim is to run a SSH chroot environment (called "jails" in the FreeBSD world) for every single client. The client will then be able to send data over SSH using rsync in his own chroot environment (using root account).
-.PP
-Incrementals are stored outside the chroot using hard links or btrfs snapshots (thus incrementals are not accessible by clients). This method has the advantage to keep incrementals securely isolated using low space on device.
-.PP
-A suitable volume size must be mounted on /backup (usage of **btrfs** is preferable, providing subvolume and snapshot fonctionnality). For security reason, you can use an encrypted volume (e.g. **luks**)
-.PP
-.SH BKCTLD COMMANDS
-bkctld init <jailname>
-.RS 4
-Create an evobackup jail.
-.RE
-.PP
-bkctld update <jailname>|all
-.RS 4
-Update an evobackup jail or all.
-.RE
-.PP
-bkctld remove <jailname>|all
-.RS 4
-Remove an evobackup jail or all.
-.RE
-.PP
-bkctld start <jailname>|all
-.RS 4
-Start an evobackup jail or all.
-.RE
-.PP
-bkctld stop <jailname>|all
-.RS 4
-Stop an evobackup jail or all.
-.RE
-.PP
-bkctld reload <jailname>|all
-.RS 4
-Reload an evobackup jail or all.
-.RE
-.PP
-bkctld restart <jailname>|all
-.RS 4
-Restart an evobackup jail or all.
-.RE
-.PP
-bkctld sync <jailname>|all
-.RS 4
-Sync an evobackup jail or all.
-.RE
-.RS 4
-Second server is defined by $NODE var in /etc/default/bkctld.
-.RE
-.PP
-bkctld status [<jailname>]
-.RS 4
-Print status of all evobackup jail or one jail.
-.RE
-.PP
-bkctld key <jailname> [<keyfile>]
-.RS 4
-Print or set the SSH public key of an evobackup jail.
-.RE
-.PP
-bkctld port <jailname> [<ssh_port>|auto]
-.RS 4
-Print or set the SSH port of an evobackup jail.
-.RE
-.RS 4
-Auto to set next available port (last + 1).
-.RE
-.PP
-bkctld ip <jailname> [<ip>|all]
-.RS 4
-Print or set allowed IP of an evobackup jail.
-.RE
-.RS 4
-All for unrestricted access (default).
-.RE
-.PP
-bkctld inc
-.RS 4
-Generate inc of an evobackup jail.
-.RE
-.PP
-bkctld rm
-.RS 4
-Remove old inc of an evobackup jail.
-.RE
-.PP
-.SH CONFIGURATION VARS
-bkctld configuration has to be set in /etc/default/bkctld file.
-.SH REQUIREDS VARS
-Default required vars are defined in bkctld script. Alter them to override default values.
-.RE
-.PP
-CONFDIR
-.RS 4
-Dir where incremental backup is configured. See INCS CONFIGURATION section for details.
-.RE
-.RS 4
-default : /etc/evobackup
-.RE
-.PP
-JAILDIR
-.RS 4
-Dir for jail's root dir. BTRFS recommended.
-.RE
-.RS 4
-default : /backup/jails
-.RE
-.PP
-INCDIR
-.RS 4
-Dir where incremental backup is stored. BTRFS recommended.
-default : /backups/incs
-.RE
-.PP
-TPLDIR
-.RS 4
-Dir where jail template file is stored.
-.RE
-.RS 4
-default : /usr/share/bkctld
-.RE
-.PP
-LOCALTPLDIR
-.RS 4
-Dir for surcharge jail templates.
-.RE
-.RS 4
-default : /usr/local/share/bkctld
-.RE
-.PP
-LOGLEVEL
-.RS 4
-Define loglevel, based on syslog severity level
-.RE
-.RS 4
-default : 6
-.RE
-.PP
-.SH OPTIONALS VARS
-Optionnals vars are no default value. No set them desactivate correspondant fonctionnality.
-.RE
-.PP
-FIREWALL_RULES
-.RS 4
-Configuration file were firewall was configured to allow jail access. This file must be sourced by your firewall configuration tool.
-.RE
-.RS 4
-Default : no firewall auto configuration
-.SH INCS CONFIGURATION
-Incremental backups was configured in $CONFDIR/<jailname>. Some example of syntax.
-.RE
-.PP
-Keep the incrememtal backup of today
-.RS 4
-+%Y-%m-%d.-0day
-.RE
-.PP
-Keep the incremental backup of yesterday
-.RS 4
-+%Y-%m-%d.-1day
-.RE
-.PP
-Keep the incremental backup of the first day of this month
-.RS 4
-+%Y-%m-01.-0month
-.RE
-.PP
-Keep the incremental backup of the first day of last month
-.RS 4
-+%Y-%m-01.-1month
-.RE
-.PP
-Keep the incremental backup of every 15 days
-.RS 4
-+%Y-%m-01.-1month
-.RE
-.RS 4
-+%Y-%m-15.-1month
-.RE
-.PP
-Keep the incremental backup of the first january
-.RS 4
-+%Y-01-01.-1month
-.RE
-.PP
-.PP
-Default value : keep incremental of last 4 days and last 2 months. Change default in $LOCALTPLDIR/inc.tpl.
-
-    +%Y-%m-%d.-0day
-    +%Y-%m-%d.-1day
-    +%Y-%m-%d.-2day
-    +%Y-%m-%d.-3day
-    +%Y-%m-01.-0month
-    +%Y-%m-01.-1month
-
-.SH CLIENT CONFIGURATION
-You can save various systems on evobackup jail :  Linux, BSD, Windows, MacOSX. Only prequisites is rsync command.
-.PP
-.RS 4
-rsync -av -e "ssh -p SSH_PORT" /home/ root@SERVER_NAME:/var/backup/home/
-.PP
-.RE
-You can simply create a shell script which use rsync for backup your's servers. An example script is available in zzz_evobackup for quickstart.
-.RE
-.PP
-This documentation explain how to use this example script.
-.PP
-Install example script in crontab :
-.PP
-.RS 4
-# For Linux
-.RE
-.RS 4
-install -v -m700 zzz_evobackup /etc/cron.daily/
-.PP
-# For FreeBSD
-.RE
-.RS 4
-install -v -m700 zzz_evobackup /etc/periodic/daily/
-.PP
-.RE
-Generate an SSH key for root account with no passphrase :
-.PP
-.RS 4
-ssh-keygen
-.RE
-.PP
-Sent /root/.ssh/id_rsa.pub to backup server administrator or read BKCTLD COMMANDS section.
-.PP
-Edit zzz_evobackup script and update this variables :
-.PP
-.RS 4
-SSH_PORT
-.RS 4
-Port of corespondant evobackup jail.
-.RE
-.PP
-MAIL
-.RS 4
-Email address for notification.
-.RE
-.PP
-NODE
-.RS 4
-Use for alternate between mutiple backup servers.
-.RE
-.RS 4
-Default value permit to save on node0 on pair day and on node1 on impair day.
-.RE
-.PP
-SRV
-.RS 4
-Adress of your backup serveur.
-.RE
-.RE
-.PP
-Uncomment service dump, ex Mysql / LDAP / PostgreQL / ...
-.PP
-Itiniate SSH connection and validate fingerprint :
-.PP
-.RS 4
-ssh -p SSH_PORT SERVER_NAME
-.RE
-.PP
-Your daily evobackup is in place !
-.PP
-.SH SEE ALSO
-rsync(1), sshd(8), chroot(8) 
-.SH AUTHOR
-Victor Laborie (vlaborie@evolix.fr)
diff --git a/docs/usage.md b/docs/usage.md
new file mode 100644
index 0000000..0c67284
--- /dev/null
+++ b/docs/usage.md
@@ -0,0 +1,232 @@
+# NAME
+
+bkctld - tool to manage evobackup jail
+
+# SYNOPSIS
+
+~~~
+bkctld <command> [<args>]
+~~~
+
+# DESCRIPTION
+
+bkctld is a shell script used to set up and manage a backup server able to receive data from many servers (clients).
+
+The aim is to run a SSH chroot environment (called "jails" in the FreeBSD world) for every single client. The client will then be able to send data over SSH using rsync in his own chroot environment (using root account).
+
+Incrementals are stored outside the chroot using hard links or btrfs snapshots (thus incrementals are not accessible by clients). This method has the advantage to keep incrementals securely isolated using low space on device.
+
+A suitable volume size must be mounted on /backup (usage of **btrfs** is preferable, providing subvolume and snapshot fonctionnality). For security reason, you can use an encrypted volume (e.g. **luks**)
+
+# BKCTLD COMMANDS
+
+Create an evobackup jail :
+
+~~~
+bkctld init <jailname>
+~~~
+
+Update an evobackup jail or all :
+
+~~~
+bkctld update <jailname>|all
+~~~
+
+Remove an evobackup jail or all :
+
+~~~
+bkctld remove <jailname>|all
+~~~
+
+Start an evobackup jail or all :
+
+~~~
+bkctld start <jailname>|all
+~~~
+
+Stop an evobackup jail or all :
+
+~~~
+bkctld stop <jailname>|all
+~~~
+
+Reload an evobackup jail or all :
+
+~~~
+bkctld reload <jailname>|all
+~~~
+        
+Restart an evobackup jail or all :
+
+~~~
+bkctld restart <jailname>|all
+~~~
+
+Sync an evobackup jail or all.
+Second server is defined by $NODE var in /etc/default/bkctld :
+
+~~~
+bkctld sync <jailname>|all
+~~~
+
+Print status of all evobackup jail or one jail :
+
+~~~
+bkctld status [<jailname>]
+~~~
+
+Print or set the SSH public key of an evobackup jail :
+
+~~~
+bkctld key <jailname> [<keyfile>]
+~~~
+
+Print or set the SSH port of an evobackup jail.
+Auto to set next available port (last + 1) :
+
+~~~
+bkctld port <jailname> [<ssh_port>|auto]
+~~~
+
+Print or set allowed IP of an evobackup jail.
+All for unrestricted access (default) :
+
+~~~
+bkctld ip <jailname> [<ip>|all]
+~~~
+
+Generate inc of an evobackup jail :
+
+~~~
+bkctld inc
+~~~
+
+Remove old inc of an evobackup jail :
+
+~~~
+bkctld rm
+~~~
+
+# CONFIGURATION VARS
+
+bkctld configuration has to be set in /etc/default/bkctld file.
+
+## REQUIREDS VARS
+
+Default required vars are defined in bkctld script. Alter them to override default values.
+
+* CONFDIR (default: /etc/evobackup) : Dir where incremental backup is configured. See INCS CONFIGURATION section for details.
+* JAILDIR (default : /backup/jails) : Dir for jail's root dir. BTRFS recommended.
+* INCDIR (default : /backups/incs) : Dir where incremental backup is stored. BTRFS recommended.
+* TPLDIR (default : /usr/share/bkctld) : Dir where jail template file is stored.
+* LOCALTPLDIR (default : /usr/local/share/bkctld) : Dir for surcharge jail templates.
+* LOGLEVEL (default : 6) : Define loglevel, based on syslog severity level.
+
+## OPTIONALS VARS
+
+Optionnals vars are no default value. No set them desactivate correspondant fonctionnality.
+
+* FIREWALL_RULES (default: no firewall auto configuration) : Configuration file were firewall was configured to allow jail access. This file must be sourced by your firewall configuration tool.
+
+# INCS CONFIGURATION
+
+Incremental backups was configured in $CONFDIR/<jailname>. Some example of syntax. 
+
+Keep the incrememtal backup of today :
+
+~~~
++%Y-%m-%d.-0day
+~~~
+
+Keep the incremental backup of yesterday :
+
+~~~
++%Y-%m-%d.-1day
+~~~
+
+Keep the incremental backup of the first day of this month :
+
+~~~
++%Y-%m-01.-0month
+~~~
+
+Keep the incremental backup of the first day of last month :
+
+~~~
++%Y-%m-01.-1month
+~~~
+
+Keep the incremental backup of every 15 days :
+
+~~~
++%Y-%m-01.-1month
++%Y-%m-15.-1month
+~~~
+
+Keep the incremental backup of the first january :
+
+~~~
++%Y-01-01.-1month
+~~~
+
+Default value : keep incremental of last 4 days and last 2 months. Change default in $LOCALTPLDIR/inc.tpl :
+
+~~~
++%Y-%m-%d.-0day
++%Y-%m-%d.-1day
++%Y-%m-%d.-2day
++%Y-%m-%d.-3day
++%Y-%m-01.-0month
++%Y-%m-01.-1month
+~~~
+
+# CLIENT CONFIGURATION
+
+You can save various systems on evobackup jail :  Linux, BSD, Windows, MacOSX. Only prequisites is rsync command.
+
+~~~
+rsync -av -e "ssh -p SSH_PORT" /home/ root@SERVER_NAME:/var/backup/home/
+~~~
+
+You  can  simply create a shell script which use rsync for backup your's servers. An example script is available in zzz_evobackup for quickstart.
+
+This documentation explain how to use this example script.
+
+Install example script in crontab :
+
+~~~
+# For Linux
+install -v -m700 zzz_evobackup /etc/cron.daily/
+
+# For FreeBSD
+install -v -m700 zzz_evobackup /etc/periodic/daily/
+~~~
+
+Generate an SSH key for root account with no passphrase :
+
+~~~
+ssh-keygen
+~~~
+
+Sent /root/.ssh/id_rsa.pub to backup server administrator or read BKCTLD COMMANDS section.
+
+Edit zzz_evobackup script and update this variables :
+
+* SSH_PORT : Port of corespondant evobackup jail.
+* MAIL : Email address for notification.
+* NODE : Use for alternate between mutiple backup servers. Default value permit to save on node0 on pair day and on node1 on impair day.
+* SRV : Adress of your backup serveur.
+
+Uncomment service dump, ex Mysql / LDAP / PostgreQL / ...
+
+Itiniate SSH connection and validate fingerprint :
+
+~~~
+ssh -p SSH_PORT SERVER_NAME
+~~~
+
+Your daily evobackup is in place !
+
+# SEE ALSO
+
+rsync(1), sshd(8), chroot(8).