safebox/proxy-scheduler
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Checking generate certificate and create dhparam file if proxy dir not exists and finalize recovering process with domain delete from domain dir if any error happened

Browse Source
This commit is contained in:
Gyorgy Berenyi
2022-10-26 12:22:29 +00:00
parent 6801a7b83c
commit 8bf5736043
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/check_certificates.sh
View File

@@ -2,6 +2,7 @@
# Set env variables # Set env variables
GENERATE_CERTIFICATE=$GENERATE_CERTIFICATE
DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL
LETSENCRYPT_URL=$LETSENCRYPT_URL LETSENCRYPT_URL=$LETSENCRYPT_URL
LETSENCRYPT_SERVICE_NAME=$LETSENCRYPT_SERVICE_NAME LETSENCRYPT_SERVICE_NAME=$LETSENCRYPT_SERVICE_NAME
@@ -90,20 +91,22 @@ if [ ! -f "$DOMAIN_CERT_DIR/dhparam.pem" ]; then
openssl dhparam -dsaparam -out $DOMAIN_CERT_DIR/dhparam.pem 4096; openssl dhparam -dsaparam -out $DOMAIN_CERT_DIR/dhparam.pem 4096;
fi fi
CURL_CHECK="curl -s -o /dev/null -w "%{http_code}" https://$LETSENCRYPT_URL"; if [ "$GENERATE_CERTIFICATE" == "true" ]; then
if [[ "$(eval $CURL_CHECK)" != "200" ]] ; then CURL_CHECK="curl -s -o /dev/null -w "%{http_code}" https://$LETSENCRYPT_URL";
create_self_signed_certificate;
else
file="$DOMAIN_CERT_DIR/letsencrypt"
{
echo "{ \"DOMAIN\": \"$DOMAIN\" }"
} >> "$file"
letsencrypt_certificates;
if [[ ! -f /$DOMAIN_CERT_DIR/key.pem && ! -f /$DOMAIN_CERT_DIR/fullchain.pem && ! -f /$DOMAIN_CERT_DIR/cert.pem ]] ; then if [[ "$(eval $CURL_CHECK)" != "200" ]] ; then
create_self_signed_certificate; create_self_signed_certificate;
else
file="$DOMAIN_CERT_DIR/letsencrypt"
{
echo "{ \"DOMAIN\": \"$DOMAIN\" }"
} >> "$file"
letsencrypt_certificates;
if [[ ! -f /$DOMAIN_CERT_DIR/key.pem && ! -f /$DOMAIN_CERT_DIR/fullchain.pem && ! -f /$DOMAIN_CERT_DIR/cert.pem ]] ; then
create_self_signed_certificate;
fi
fi fi
fi fi

13
scripts/check_proxy_state.sh
View File

@@ -8,6 +8,7 @@ REGISTRY_URL=$DOCKER_REGISTRY_URL
# Set env variables # Set env variables
DOMAIN="$1" DOMAIN="$1"
DOMAIN_DIR=$DOMAIN_DIR
PROXY_SERVICE_FILE=$PROXY_SERVICE_FILE PROXY_SERVICE_FILE=$PROXY_SERVICE_FILE
ROLE=$ROLE ROLE=$ROLE
SERVICE_NAME=$SERVICE_NAME SERVICE_NAME=$SERVICE_NAME
@@ -65,6 +66,8 @@ do_proxy_restart() {
else else
echo "Reached retrying limit: "$RESTART" ,giving up, starting recocer previous state" echo "Reached retrying limit: "$RESTART" ,giving up, starting recocer previous state"
recover_process; recover_process;
fi fi
done done
fi fi
@@ -82,7 +85,15 @@ check_domain() {
fi fi
} }
recover_process() { echo "Recovering previous state" recover_process() {
echo "Recovering previous state";
rm $DOMAIN_DIR/$DOMAIN;
echo "#############################################################################"
echo "######## DOMAIN ##### $DOMAIN #### DELETED ################"
echo "#############################################################################"
exit;
} }
send_error_msg () { echo "Sending error messages" send_error_msg () { echo "Sending error messages"

2
scripts/nginx_config_create.sh
View File

@@ -27,7 +27,7 @@ ALLOWED_NETWORK=$(jq -r '.ALLOWED_NETWORK | select(.!="null") | join(" ")' $DOMA
ALTERNATE_LOCATION_PATH=$(jq -r .ALTERNATE_LOCATION_PATH $DOMAIN_SOURCE) ALTERNATE_LOCATION_PATH=$(jq -r .ALTERNATE_LOCATION_PATH $DOMAIN_SOURCE)
# check whether certificates exist or not # check whether certificates exist or not
if [[ "$HTTPS_PORT" != "" && "$GENERATE_CERTIFICATE" == "true" ]]; then if [ "$HTTPS_PORT" != "" ]; then
/scripts/check_certificates.sh "$DOMAIN"; /scripts/check_certificates.sh "$DOMAIN";
fi fi