From 2eec8864c822dc98214a362c55982be80499ec9d Mon Sep 17 00:00:00 2001
From: cimryan <cimryan@users.noreply.github.com>
Date: Sat, 3 Nov 2018 17:31:28 -0700
Subject: [PATCH] Testing for archive reachability is different for each
 archive system, but necessary for all systems.

---
 run/archiveloop                            | 4 +++-
 run/cifs_archive/archive-is-reachable.sh   | 5 +++++
 run/rclone_archive/archive-is-reachable.sh | 3 +++
 run/rsync_archive/archive-is-reachable.sh  | 5 +++++
 setup/pi/configure.sh                      | 1 +
 5 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 run/cifs_archive/archive-is-reachable.sh
 create mode 100644 run/rclone_archive/archive-is-reachable.sh
 create mode 100644 run/rsync_archive/archive-is-reachable.sh

diff --git a/run/archiveloop b/run/archiveloop
index 22da133..24dab5b 100644
--- a/run/archiveloop
+++ b/run/archiveloop
@@ -26,7 +26,9 @@ function fix_errors_in_mounted_files () {
 
 function archive_is_reachable () {
   local reachable=true
-  hping3 -c 1 -S -p 445 "$ARCHIVE_HOST_NAME" > /dev/null 2>&1 || reachable=false
+
+  /root/bin/archive-is-reachable.sh || reachable=false
+
   if [ "$reachable" = false ]
   then
     false
diff --git a/run/cifs_archive/archive-is-reachable.sh b/run/cifs_archive/archive-is-reachable.sh
new file mode 100644
index 0000000..dd3b102
--- /dev/null
+++ b/run/cifs_archive/archive-is-reachable.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -eu
+
+ARCHIVE_HOST_NAME="$1"
+
+hping3 -c 1 -S -p 445 "$ARCHIVE_HOST_NAME" > /dev/null 2>&1
diff --git a/run/rclone_archive/archive-is-reachable.sh b/run/rclone_archive/archive-is-reachable.sh
new file mode 100644
index 0000000..4fc034a
--- /dev/null
+++ b/run/rclone_archive/archive-is-reachable.sh
@@ -0,0 +1,3 @@
+#!/bin/bash -eu
+
+ping -q -w 1 -c 1 8.8.8.8 > /dev/null 2>&1
diff --git a/run/rsync_archive/archive-is-reachable.sh b/run/rsync_archive/archive-is-reachable.sh
new file mode 100644
index 0000000..0ba86dd
--- /dev/null
+++ b/run/rsync_archive/archive-is-reachable.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -eu
+
+ARCHIVE_HOST_NAME="$1"
+
+ping -q -w 1 -c 1 "$ARCHIVE_HOST_NAME" > /dev/null 2>&1
diff --git a/setup/pi/configure.sh b/setup/pi/configure.sh
index cc6874c..fc22fde 100644
--- a/setup/pi/configure.sh
+++ b/setup/pi/configure.sh
@@ -122,6 +122,7 @@ function install_archive_scripts () {
     get_script $install_path connect-archive.sh $archive_module
     get_script $install_path disconnect-archive.sh $archive_module
     get_script $install_path write-archive-configs-to.sh $archive_module
+    get_script $install_path archive-is-reachable.sh $archive_module
 }