From ef1c2c6c78ce94cf8ef2b72355b4ebd496c2b48f Mon Sep 17 00:00:00 2001
From: Matthew McKinnon <mmckinnon@comprofix.com>
Date: Thu, 1 Nov 2018 14:51:26 +1000
Subject: [PATCH] Removed GoDaddy Scripts

---
 godaddy-ddns | 112 ---------------------------------------------------
 ssl-install  |  12 +++---
 2 files changed, 6 insertions(+), 118 deletions(-)
 delete mode 100755 godaddy-ddns

diff --git a/godaddy-ddns b/godaddy-ddns
deleted file mode 100755
index f51a33e..0000000
--- a/godaddy-ddns
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-# GoDaddy.sh v1.0 by Nazar78 @ TeaNazaR.com
-###########################################
-# Simple DDNS script to update GoDaddy's DNS. Just schedule every 5mins in crontab.
-# With options to run scripts/programs/commands on update failure/success.
-#
-# Requirements:
-# - Bash - On LEDE/OpenWRT, opkg install bash
-# - curl CLI - On Debian, apt-get install curl
-#
-# History:
-# v1.0 - 20160513 - 1st release.
-#
-# PS: Feel free to distribute but kindly retain the credits (-:
-###########################################
-
-# Begin settings
-# Get the Production API key/secret from https://developer.godaddy.com/keys/.
-# Ensure it's for "Production" as first time it's created for "Test".
-#Key=<API production key>
-#Secret=<API secret>
-
-Key=A4vTD3PLEX1_G3C4VGGaDiha9BCZZc2ZpP
-Secret=G3C6k2r1kAbKfMHnws3BAs
-
-# Domain to update.
-Domain=comprofix.com
-
-# Advanced settings - change only if you know what you're doing :-)
-# Record type, as seen in the DNS setup page, default A.
-Type=A
-
-# Record name, as seen in the DNS setup page, default @.
-Name=home
-
-# Time To Live in seconds, minimum default 600 (10mins).
-# If your public IP seldom changes, set it to 3600 (1hr) or more for DNS servers cache performance.
-TTL=600
-
-# Writable path to last known Public IP record cached. Best to place in tmpfs.
-CachedIP=/tmp/current_ip
-
-# External URL to check for current Public IP, must contain only a single plain text IP.
-# Default http://api.ipify.org.
-CheckURL=http://api.ipify.org
-
-# Optional scripts/programs/commands to execute on successful update. Leave blank to disable.
-# This variable will be evaluated at runtime but will not be parsed for errors nor execution guaranteed.
-# Take note of the single quotes. If it's a script, ensure it's executable i.e. chmod 755 ./script.
-# Example: SuccessExec='/bin/echo "$(date): My public IP changed to ${PublicIP}!">>/var/log/GoDaddy.sh.log'
-SuccessExec=''
-
-# Optional scripts/programs/commands to execute on update failure. Leave blank to disable.
-# This variable will be evaluated at runtime but will not be parsed for errors nor execution guaranteed.
-# Take note of the single quotes. If it's a script, ensure it's executable i.e. chmod 755 ./script.
-# Example: FailedExec='/some/path/something-went-wrong.sh ${Update} && /some/path/email-script.sh ${PublicIP}'
-FailedExec=''
-# End settings
-
-Curl=$(/usr/bin/which curl 2>/dev/null)
-Touch=$(/usr/bin/which touch 2>/dev/null)
-[ "${Curl}" = "" ] &&
-echo "Error: Unable to find 'curl CLI'." && exit 1
-[ -z "${Key}" ] || [ -z "${Secret}" ] &&
-echo "Error: Requires API 'Key/Secret' value." && exit 1
-[ -z "${Domain}" ] &&
-echo "Error: Requires 'Domain' value." && exit 1
-[ -z "${Type}" ] && Type=A
-[ -z "${Name}" ] && Name=@
-[ -z "${TTL}" ] && TTL=600
-[ "${TTL}" -lt 600 ] && TTL=600
-${Touch} ${CachedIP} 2>/dev/null
-[ $? -ne 0 ] && echo "Error: Can't write to ${CachedIP}." && exit 1
-[ -z "${CheckURL}" ] && CheckURL=http://api.ipify.org
-echo -n "Checking current 'Public IP' from '${CheckURL}'..."
-PublicIP=$(${Curl} -kLs ${CheckURL})
-if [ $? -eq 0 ] && [[ "${PublicIP}" =~ [0-9]{1,3}\.[0-9]{1,3} ]];then
-  echo "${PublicIP}!"
-else
-  echo "Fail! ${PublicIP}"
-  eval ${FailedExec}
-  exit 1
-fi
-if [ "$(cat ${CachedIP} 2>/dev/null)" != "${PublicIP}" ];then
-  echo -n "Checking '${Domain}' IP records from 'GoDaddy'..."
-  Check=$(${Curl} -kLsH"Authorization: sso-key ${Key}:${Secret}" \
-  -H"Content-type: application/json" \
-  https://api.godaddy.com/v1/domains/${Domain}/records/${Type}/${Name} \
-  2>/dev/null|jq -r '.[0].data'>/dev/null)
-  if [ $? -eq 0 ] && [ "${Check}" = "${PublicIP}" ];then
-    echo -n ${Check}>${CachedIP}
-    echo -e "unchanged!\nCurrent 'Public IP' matches 'GoDaddy' records. No update required!"
-  else
-    echo -en "changed!\nUpdating '${Domain}'..."
-    Update=$(${Curl} -kLsXPUT -H"Authorization: sso-key ${Key}:${Secret}" \
-    -H"Content-type: application/json" \
-    https://api.godaddy.com/v1/domains/${Domain}/records/${Type}/${Name} \
-    -d "[{\"data\":\"${PublicIP}\",\"ttl\":${TTL}}]" 2>/dev/null)
-    if [ $? -eq 0 ] && [ "${Update}" = "" ];then
-      echo -n ${PublicIP}>${CachedIP}
-      echo "Success!"
-      eval ${SuccessExec}
-    else
-      echo "Fail! ${Update}"
-      eval ${FailedExec}
-      exit 1
-    fi
-  fi
-else
-  echo "Current 'Public IP' matches 'Cached IP' recorded. No update required!"
-fi
-exit $?
diff --git a/ssl-install b/ssl-install
index c272cf5..8670a71 100755
--- a/ssl-install
+++ b/ssl-install
@@ -14,8 +14,8 @@
 #
 #
 
-DOM_NAME="comprofix.com"
-ESXI_SERVER="esxi.comprofix.com"
+DOM_NAME="home.comprofix.com"
+ESXI_SERVER="esxi.home.comprofix.com"
 
 
 if [ ! -d $HOME/.acme.sh ]; then
@@ -27,11 +27,11 @@ else
 fi
 
 
-scp -q ~/.acme.sh/$DOM_NAME/$DOM_NAME.cer root@$ESXI_SERVER:/etc/vmware/ssl/rui.crt
-scp -q ~/.acme.sh/$DOM_NAME/$DOM_NAME.key root@$ESXI_SERVER:/etc/vmware/ssl/rui.key
+scp  ~/.acme.sh/$DOM_NAME/$DOM_NAME.cer root@$ESXI_SERVER:/etc/vmware/ssl/rui.crt
+scp  ~/.acme.sh/$DOM_NAME/$DOM_NAME.key root@$ESXI_SERVER:/etc/vmware/ssl/rui.key
 #ssh -qt root@$ESXI_SERVER "/sbin/services.sh restart"
-ssh -qt root@$ESXI_SERVER "/etc/init.d/hostd restart"
-ssh -qt root@$ESXI_SERVER "/etc/init.d/vpxa restart"
+ssh -t root@$ESXI_SERVER "/etc/init.d/hostd restart"
+ssh -t root@$ESXI_SERVER "/etc/init.d/vpxa restart"