From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Tue, 16 Apr 2019 14:31:05 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=060960b84cec5ffd96752f8819e50c03c1edb82e;hp=7f97e188740a9d362fe3a1ddf00baef44fdc5748

Merge branch 'dev'
---

diff --git a/modules/role/manifests/backup.pp b/modules/role/manifests/backup.pp
index 6b8d00c..bdc35d5 100644
--- a/modules/role/manifests/backup.pp
+++ b/modules/role/manifests/backup.pp
@@ -70,6 +70,7 @@ class role::backup (
     $dirname = $infos["name"]
     $login = $infos["login"]
     $host = $infos["host"]
+    $port = if $infos.dig("port") { $infos.dig("port") } else { 22 }
     $dest = "$login@$host"
     $base = "$mountpoint/$dirname"
     $nbr  = $infos["nbr"]
diff --git a/modules/role/templates/backup/backup_dirname_head.sh.erb b/modules/role/templates/backup/backup_dirname_head.sh.erb
index e20cfd3..15a0448 100644
--- a/modules/role/templates/backup/backup_dirname_head.sh.erb
+++ b/modules/role/templates/backup/backup_dirname_head.sh.erb
@@ -1,4 +1,5 @@
 ##### <%= @dirname %> #####
+PORT="<%= @port %>"
 DEST="<%= @dest %>"
 BASE="<%= @base %>"
 OLD_BAK_BASE=$BASE/older/j
@@ -10,6 +11,7 @@ if ! ssh \
     -o PreferredAuthentications=publickey \
     -o StrictHostKeyChecking=yes \
     -o ClearAllForwardings=yes \
+    -p $PORT \
     $DEST backup; then
   echo "Fichier de verrouillage backup sur $DEST ou impossible de se connecter" >&2
   skip=$DEST
diff --git a/modules/role/templates/backup/backup_dirname_part.sh.erb b/modules/role/templates/backup/backup_dirname_part.sh.erb
index ec662c4..77d4206 100644
--- a/modules/role/templates/backup/backup_dirname_part.sh.erb
+++ b/modules/role/templates/backup/backup_dirname_part.sh.erb
@@ -11,7 +11,7 @@ cat > $FILES_FROM <<EOF
 EOF
 
 OUT=$RSYNC_OUTPUT/$LOCAL
-rsync -XAavbrz --fake-super -e ssh --numeric-ids --delete \
+rsync -XAavbrz --fake-super -e "ssh -p $PORT" --numeric-ids --delete \
   --backup-dir=$BAK_BASE/$LOCAL \
 <%- unless @args.empty? -%>
   <%= @args %>\
diff --git a/modules/role/templates/backup/backup_dirname_tail.sh.erb b/modules/role/templates/backup/backup_dirname_tail.sh.erb
index 5027992..11de00c 100644
--- a/modules/role/templates/backup/backup_dirname_tail.sh.erb
+++ b/modules/role/templates/backup/backup_dirname_tail.sh.erb
@@ -1,4 +1,4 @@
 
-  ssh $DEST sh -c "date > .cache/last_backup"
+  ssh -p $PORT $DEST sh -c "date > .cache/last_backup"
 fi # [ "$skip" != "$DEST" ]
 ##### End <%= @dirname %> #####