update revoke.sh

add network check
acavella · Dec 28, 2023 · c8a0c9a · c8a0c9a
1 parent da42420
commit c8a0c9a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/conf/revoke.yml b/conf/revoke.yml
@@ -2,7 +2,6 @@
 default:
   gateway: google.com
   www: /var/www/revoke/
-  tmpDir: /tmp/
 
 ca:
   - id: x11

diff --git a/revoke.sh b/revoke.sh
@@ -20,7 +20,7 @@ config="${baseDir}/conf/revoke.yml"
 log="${baseDir}/logs/revoke_${fileDTG}.log"
 wwwdir=$(./lib/yq4 -r .default.www ${config})
 arraySize=$(./lib/yq4 '.ca | length' ${config})
-defGW=$(/usr/sbin/ip route show default | /usr/bin/awk '/default/ {print $3}')
+defGW=$(./lib/yq4 -r .default.gateway ${config})
 
 ## FUNCTIONS
 
@@ -54,7 +54,15 @@ check_config() {
 }
 
 check_network() {
-  commands
+  ping -c 1 $defGW >/dev/null 2>&1;
+  pingExit=$?
+  if [ $pingExit -eq 0 ]
+  then
+    printf "$(date '+%Y-%m-%dT%H:%M:%S') [info] received ping response from ${defgw}\n"
+  else
+    printf "$(date '+%Y-%m-%dT%H:%M:%S') [error] ping response not received from ${defgw}\n"
+    exit 1
+  fi
 }
 
 
@@ -98,6 +106,7 @@ download_crl() {
 main() {
   show_version
   check_config
+  check_network
   download_crl
   fix_permissions
 }