Remove unnecessary curly braces

This commit is contained in:
Miroslav Suvada 2023-10-13 18:06:40 +02:00
parent 086ad134b1
commit 79c9b9f694

View File

@ -1,56 +1,58 @@
#!/bin/bash #!/bin/bash
#set -x
while getopts 'u:h:p:k:d:c:' OPTION; do while getopts 'u:h:p:k:d:c:' OPTION; do
case "$OPTION" in case "$OPTION" in
u) u)
ROUTEROS_USER=${OPTARG} ROUTEROS_USER=$OPTARG
;; ;;
h) h)
ROUTEROS_HOST=${OPTARG} ROUTEROS_HOST=$OPTARG
;; ;;
p) p)
ROUTEROS_SSH_PORT=${OPTARG} ROUTEROS_SSH_PORT=$OPTARG
;; ;;
k) k)
ROUTEROS_PRIVATE_KEY=${OPTARG} ROUTEROS_PRIVATE_KEY=$OPTARG
;; ;;
d) d)
DOMAIN=${OPTARG} DOMAIN=$OPTARG
;; ;;
c) c)
CONFIG=${OPTARG} CONFIG=$OPTARG
;; ;;
esac *)
echo "Unknown option '$OPTION'"
;;
esac
done done
shift "$(($OPTIND -1))" shift "$((OPTIND - 1))"
if [[ -n ${CONFIG} ]]; then if [[ -n $CONFIG ]]; then
source $CONFIG source "$CONFIG"
elif [[ -z ${ROUTEROS_USER} ]] || [[ -z ${ROUTEROS_HOST} ]] || [[ -z ${ROUTEROS_SSH_PORT} ]] || [[ -z ${ROUTEROS_PRIVATE_KEY} ]] || [[ -z ${DOMAIN} ]]; then elif [[ -z $ROUTEROS_USER ]] || [[ -z $ROUTEROS_HOST ]] || [[ -z $ROUTEROS_SSH_PORT ]] || [[ -z $ROUTEROS_PRIVATE_KEY ]] || [[ -z $DOMAIN ]]; then
echo -e "Usage:\n$0 -c /path/to/config\nOR\n$0 -u [RouterOS User] -h [RouterOS Host] -p [SSH Port] -k [SSH Private Key] -d [Domain]" echo -e "Usage:\n$0 -c /path/to/config\nOR\n$0 -u [RouterOS User] -h [RouterOS Host] -p [SSH Port] -k [SSH Private Key] -d [Domain]"
exit 1 exit 1
fi fi
if [[ -z ${ROUTEROS_USER} ]] || [[ -z ${ROUTEROS_HOST} ]] || [[ -z ${ROUTEROS_SSH_PORT} ]] || [[ -z ${ROUTEROS_PRIVATE_KEY} ]] || [[ -z ${DOMAIN} ]]; then if [[ -z $ROUTEROS_USER ]] || [[ -z $ROUTEROS_HOST ]] || [[ -z $ROUTEROS_SSH_PORT ]] || [[ -z $ROUTEROS_PRIVATE_KEY ]] || [[ -z $DOMAIN ]]; then
echo "Check the config file ${CONFIG_FILE} or start with params: $0 -u [RouterOS User] -h [RouterOS Host] -p [SSH Port] -k [SSH Private Key] -d [Domain]" echo "Check the config file $CONFIG_FILE or start with params: $0 -u [RouterOS User] -h [RouterOS Host] -p [SSH Port] -k [SSH Private Key] -d [Domain]"
echo "Please avoid spaces" echo "Please avoid spaces"
exit 1 exit 1
fi fi
CERTIFICATE=/etc/letsencrypt/live/${DOMAIN}/cert.pem CERTIFICATE=/etc/letsencrypt/live/${DOMAIN}/cert.pem
KEY=/etc/letsencrypt/live/${DOMAIN}/privkey.pem KEY=/etc/letsencrypt/live/${DOMAIN}/privkey.pem
echo "" echo ""
echo "Updating certificate for ${DOMAIN}" echo "Updating certificate for $DOMAIN"
echo " Using certificate ${CERTIFICATE}" echo " Using certificate $CERTIFICATE"
echo " User private key ${KEY}" echo " User private key $KEY"
#Create alias for RouterOS command #Create alias for RouterOS command
routeros="ssh -o PubkeyAcceptedKeyTypes=+ssh-dss -o StrictHostKeyChecking=${SSH_STRICT_KEY_CHECKING:-yes} -i ${ROUTEROS_PRIVATE_KEY} ${ROUTEROS_USER}@${ROUTEROS_HOST} -p ${ROUTEROS_SSH_PORT}" routeros="ssh -o PubkeyAcceptedKeyTypes=+ssh-dss -o StrictHostKeyChecking=${SSH_STRICT_KEY_CHECKING:-yes} -i $ROUTEROS_PRIVATE_KEY ${ROUTEROS_USER}@${ROUTEROS_HOST} -p $ROUTEROS_SSH_PORT"
#Create alias for scp command #Create alias for scp command
scp="scp -q -o PubkeyAcceptedKeyTypes=+ssh-dss -o StrictHostKeyChecking=${SSH_STRICT_KEY_CHECKING:-yes} -P ${ROUTEROS_SSH_PORT} -i ${ROUTEROS_PRIVATE_KEY}" scp="scp -q -o PubkeyAcceptedKeyTypes=+ssh-dss -o StrictHostKeyChecking=${SSH_STRICT_KEY_CHECKING:-yes} -P $ROUTEROS_SSH_PORT -i $ROUTEROS_PRIVATE_KEY"
echo "" echo ""
echo "Checking connection to RouterOS" echo "Checking connection to RouterOS"
@ -60,23 +62,23 @@ $routeros /system resource print
RESULT=$? RESULT=$?
if [[ ! ${RESULT} == 0 ]]; then if [[ ! ${RESULT} == 0 ]]; then
echo -e "\nError in: $routeros" echo -e "\nError in: $routeros"
echo "More info: https://wiki.mikrotik.com/wiki/Use_SSH_to_execute_commands_(DSA_key_login)" echo "More info: https://wiki.mikrotik.com/wiki/Use_SSH_to_execute_commands_(DSA_key_login)"
exit 1 exit 1
else else
echo -e "\nConnection to RouterOS Successful!\n" echo -e "\nConnection to RouterOS Successful!\n"
fi fi
if [ ! -f ${CERTIFICATE} ] && [ ! -f ${KEY} ]; then if [ ! -f "$CERTIFICATE" ] && [ ! -f "$KEY" ]; then
echo -e "\nFile(s) not found:\n${CERTIFICATE}\n${KEY}\n" echo -e "\nFile(s) not found:\n${CERTIFICATE}\n${KEY}\n"
echo -e "Please use CertBot Let'sEncrypt:" echo -e "Please use CertBot Let'sEncrypt:"
echo "============================" echo "============================"
echo "certbot certonly --preferred-challenges=dns --manual -d ${DOMAIN} --manual-public-ip-logging-ok" echo "certbot certonly --preferred-challenges=dns --manual -d $DOMAIN --manual-public-ip-logging-ok"
echo "or (for wildcard certificate):" echo "or (for wildcard certificate):"
echo "certbot certonly --preferred-challenges=dns --manual -d *.${DOMAIN} --manual-public-ip-logging-ok --server https://acme-v02.api.letsencrypt.org/directory" echo "certbot certonly --preferred-challenges=dns --manual -d *.$DOMAIN --manual-public-ip-logging-ok --server https://acme-v02.api.letsencrypt.org/directory"
echo "===========================" echo "==========================="
echo -e "and follow instructions from CertBot\n" echo -e "and follow instructions from CertBot\n"
exit 1 exit 1
fi fi
# Set up variables to remove errors # Set up variables to remove errors
@ -85,61 +87,61 @@ DOMAIN_CERT_FILE=${DOMAIN}.pem
DOMAIN_KEY_FILE=${DOMAIN}.key DOMAIN_KEY_FILE=${DOMAIN}.key
# Remove previous certificate # Remove previous certificate
echo "Removing old certificate from installed certificates: ${DOMAIN_INSTALLED_CERT_FILE}" echo "Removing old certificate from installed certificates: $DOMAIN_INSTALLED_CERT_FILE"
$routeros /certificate remove [find name=${DOMAIN_INSTALLED_CERT_FILE}] $routeros /certificate remove [find name="$DOMAIN_INSTALLED_CERT_FILE"]
echo "" echo ""
echo "Handling new certificate file" echo "Handling new certificate file"
# Create Certificate # Create Certificate
# Delete Certificate file if the file exist on RouterOS # Delete Certificate file if the file exist on RouterOS
echo " Deleting any old copy of certificate file from disk: ${DOMAIN_CERT_FILE}" echo " Deleting any old copy of certificate file from disk: $DOMAIN_CERT_FILE"
$routeros /file remove ${DOMAIN_CERT_FILE} > /dev/null $routeros /file remove "$DOMAIN_CERT_FILE" >/dev/null
# Upload Certificate to RouterOS # Upload Certificate to RouterOS
echo " Uploading new domain certificate file to router: ${CERTIFICATE}" echo " Uploading new domain certificate file to router: $CERTIFICATE"
$scp "${CERTIFICATE}" "${ROUTEROS_USER}"@"${ROUTEROS_HOST}":"${DOMAIN_CERT_FILE}" $scp "$CERTIFICATE" "$ROUTEROS_USER"@"$ROUTEROS_HOST":"$DOMAIN_CERT_FILE"
sleep 2 sleep 2
# Import Certificate file # Import Certificate file
echo " Importing new certificate file to router certificates" echo " Importing new certificate file to router certificates"
$routeros /certificate import file-name=${DOMAIN_CERT_FILE} passphrase=\"\" $routeros /certificate import file-name="$DOMAIN_CERT_FILE" passphrase=\"\"
# Delete Certificate file after import # Delete Certificate file after import
echo " Deleting any new copy of certificate file from disk: ${DOMAIN_CERT_FILE}" echo " Deleting any new copy of certificate file from disk: $DOMAIN_CERT_FILE"
$routeros /file remove ${DOMAIN_CERT_FILE} $routeros /file remove "$DOMAIN_CERT_FILE"
echo "" echo ""
echo "Handling new key file" echo "Handling new key file"
# Create Key # Create Key
# Delete Certificate file if the file exist on RouterOS # Delete Certificate file if the file exist on RouterOS
echo " Deleting any old copy of key file from disk: ${DOMAIN_KEY_FILE}" echo " Deleting any old copy of key file from disk: ${DOMAIN_KEY_FILE}"
$routeros /file remove ${DOMAIN_KEY_FILE} > /dev/null $routeros /file remove "$DOMAIN_KEY_FILE" >/dev/null
# Upload Key to RouterOS # Upload Key to RouterOS
echo " Uploading new domain key file to router: ${KEY}" echo " Uploading new domain key file to router: $KEY"
$scp "${KEY}" "${ROUTEROS_USER}"@"${ROUTEROS_HOST}":"${DOMAIN_KEY_FILE}" $scp "$KEY" "$ROUTEROS_USER"@"$ROUTEROS_HOST":"$DOMAIN_KEY_FILE"
sleep 2 sleep 2
# Import Key file # Import Key file
echo " Importing new key file to router certificates" echo " Importing new key file to router certificates"
$routeros /certificate import file-name=${DOMAIN_KEY_FILE} passphrase=\"\" $routeros /certificate import file-name="$DOMAIN_KEY_FILE" passphrase=\"\"
# Delete Certificate file after import # Delete Certificate file after import
echo " Deleting any new copy of key file from disk: ${DOMAIN_KEY_FILE}" echo " Deleting any new copy of key file from disk: $DOMAIN_KEY_FILE"
$routeros /file remove ${DOMAIN_KEY_FILE} $routeros /file remove "$DOMAIN_KEY_FILE"
echo "" echo ""
# Setup Certificate to SSTP Service # Setup Certificate to SSTP Service
if [[ "${SETUP_SERVICES[*]:-SSTP}" =~ "SSTP" ]]; then if [[ "${SETUP_SERVICES[*]:-SSTP}" =~ "SSTP" ]]; then
echo "Updating SSTP Server to use ${DOMAIN_INSTALLED_CERT_FILE}" echo "Updating SSTP Server to use $DOMAIN_INSTALLED_CERT_FILE"
$routeros /interface sstp-server server set certificate=${DOMAIN_INSTALLED_CERT_FILE} $routeros /interface sstp-server server set certificate="$DOMAIN_INSTALLED_CERT_FILE"
fi fi
# Setup Certificate to WWW Service # Setup Certificate to WWW Service
if [[ "${SETUP_SERVICES[*]:-WWW}" =~ "WWW" ]]; then if [[ "${SETUP_SERVICES[*]:-WWW}" =~ "WWW" ]]; then
echo "Updating HTTPS Server to use ${DOMAIN_INSTALLED_CERT_FILE}" echo "Updating HTTPS Server to use $DOMAIN_INSTALLED_CERT_FILE"
$routeros /ip service set www-ssl certificate=${DOMAIN_INSTALLED_CERT_FILE} $routeros /ip service set www-ssl certificate="$DOMAIN_INSTALLED_CERT_FILE"
fi fi
# Setup Certificat to API Service # Setup Certificat to API Service
if [[ "${SETUP_SERVICES[*]:-API}" =~ "API" ]]; then if [[ "${SETUP_SERVICES[*]:-API}" =~ "API" ]]; then
echo "Updating API SSL Server to use ${DOMAIN_INSTALLED_CERT_FILE}" echo "Updating API SSL Server to use $DOMAIN_INSTALLED_CERT_FILE"
$routeros /ip service set api-ssl certificate=${DOMAIN_INSTALLED_CERT_FILE} $routeros /ip service set api-ssl certificate="$DOMAIN_INSTALLED_CERT_FILE"
fi fi
exit 0 exit 0