bug fix

[automated-distro-installer] / faiserver-disable

diff --git a/faiserver-disable b/faiserver-disable
index 3cb6da22ea45120a4ffb99410b98a94e35750d03..74aaef8664b806c6e10e6a9cb8329518840e3d66 100755 (executable)
--- a/faiserver-disable
+++ b/faiserver-disable
@@ -1,26 +1,33 @@
 #!/bin/bash
 
 #!/bin/bash
 

+if ! test "$BASH_VERSION"; then echo "error: shell is not bash" >&2; exit 1; fi
+shopt -s inherit_errexit 2>/dev/null ||: # ignore fail in bash < 4.4

 set -eE -o pipefail
 set -eE -o pipefail

-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" exit status: $?, PIPESTATUS: ${PIPESTATUS[*]}" >&2' ERR
+
+this_file="$(readlink -f -- "${BASH_SOURCE[0]}")"
+readonly this_file this_dir="${this_file%/*}"
+cd "$this_dir"

 
 usage() {
 
 usage() {

-    cat <<EOF
-Usage: ${0##*/}
+  cat <<'EOF'
+Usage: faiserver-disable

 Disable the fai nfs server exports
 EOF
 Disable the fai nfs server exports
 EOF

-    exit $1
+  exit $1

 }
 
 if [[ $1 ]]; then
 }
 
 if [[ $1 ]]; then

-    usage 1
+  usage 1

 fi
 
 fi
 

-ssh root@$(chost faiserver) bash <<'EOF'
-if modprobe nfsd &>/dev/null; then
-  sed -ri --follow-symlinks '\%^/srv/fai/d' /etc/exports
-  exportfs -ra
+
+
+faiserver_addr=$(host faiserver.b8.nz | sed -rn 's/^\S+ has address //p;T;q' ||:)
+if ip a | grep "^ *inet.\? $faiserver_addr" &>/dev/null; then
+  echo "$0: disabling fai nfs exports or apache site"
+  ./faiserver-disable-local

 else
 else

-  rm -f /etc/apache2/sites-enabled/faiserver.conf
-  systemctl reload apache2
+  echo "$0: sshing to $(chost faiserver.b8.nz) to disable fai nfs exports or apache site"
+  ssh root@$(chost faiserver.b8.nz) bash <faiserver-disable-local

 fi
 fi

-EOF