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

Added missing per symbol to alternate location path entry

Browse Source
This commit is contained in:
Gyorgy Berenyi
2023-01-25 10:25:19 +00:00
parent 9373f2ba3b
commit ed6d539e95
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/check_certificates.sh
View File

@@ -35,6 +35,8 @@ service_exec="docker run --rm \
-v $SERVICE_FILES/tmp/:/services/tmp/:rw \ -v $SERVICE_FILES/tmp/:/services/tmp/:rw \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
-v /usr/bin/docker:/usr/bin/docker:ro \ -v /usr/bin/docker:/usr/bin/docker:ro \
--env TIMEOUT=$TIMEOUT \
--env RESTART=$RESTART \
--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL $DOCKER_REGISTRY_URL$SETUP" --env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL $DOCKER_REGISTRY_URL$SETUP"
letsencrypt_certificates() { letsencrypt_certificates() {
@@ -60,7 +62,7 @@ letsencrypt_certificates() {
LETS_ENCRYPT_VALUE="$(docker ps | grep letsencrypt | grep Up | wc -l)"; LETS_ENCRYPT_VALUE="$(docker ps | grep letsencrypt | grep Up | wc -l)";
if [[ $LETS_ENCRYPT_VALUE -eq 0 ]] ; then if [[ $LETS_ENCRYPT_VALUE -eq 0 ]] ; then
echo "Starting letsencrypt process"; echo "Starting letsencrypt process";
$service_exec $LETSENCRYPT_SERVICE_NAME start ; $service_exec $LETSENCRYPT_SERVICE_NAME start info;
break; break;
else else
echo "Waiting "$TIMEOUT" second for previous letsencrypt process ending"; echo "Waiting "$TIMEOUT" second for previous letsencrypt process ending";
@@ -117,7 +119,7 @@ if [ "$GENERATE_CERTIFICATE" == "true" ]; then
} >> "$file"; } >> "$file";
DOMAIN_CHECK="curl -s -o /dev/null -w "%{http_code}" http://$DOMAIN"; DOMAIN_CHECK="curl -s -o /dev/null -w "%{http_code}" http://$DOMAIN";
if [[ "$(eval $DOMAIN_CHECK)" != "000" ]]; then if [[ "$(eval $DOMAIN_CHECK)" == "200" || "$(eval $DOMAIN_CHECK)" == "301" ]] ; then
letsencrypt_certificates; letsencrypt_certificates;
echo "Started letsencrypt for domain: $DOMAIN first time" echo "Started letsencrypt for domain: $DOMAIN first time"
else else

7
scripts/check_proxy_state.sh
View File

@@ -37,17 +37,16 @@ do_proxy_restart() {
local NAMES="$1" local NAMES="$1"
for PROXY_NAME in $NAMES ; do for PROXY_NAME in $NAMES ; do
docker stop $PROXY_NAME; docker stop $PROXY_NAME;
docker start $PROXY_NAME; docker start $PROXY_NAME;
sleep $TIMEOUT;
if docker ps | grep $PROXY_NAME ; then if docker ps | grep $PROXY_NAME ; then
if [ -z "$DOMAIN" ] ; then
echo "$PROXY_NAME restarted successful"; echo "$PROXY_NAME restarted successful";
fi
else else
for retries in $(seq 0 $((RESTART + 1))); do for retries in $(seq 0 $((RESTART + 1))); do
if [[ $retries -le $RESTART ]] ; then if [[ $retries -le $RESTART ]] ; then
sleep $TIMEOUT;
echo "Proxy "$PROXY_NAME" restarting in progress"; echo "Proxy "$PROXY_NAME" restarting in progress";
$service_exec $SERVICE_NAME.containers.$PROXY_NAME stop force; $service_exec $SERVICE_NAME.containers.$PROXY_NAME stop force;
@@ -56,12 +55,12 @@ do_proxy_restart() {
$service_exec $SERVICE_NAME.networks.$NETWORK_NAME start $service_exec $SERVICE_NAME.networks.$NETWORK_NAME start
$service_exec $SERVICE_NAME.containers.$PROXY_NAME start $service_exec $SERVICE_NAME.containers.$PROXY_NAME start
sleep $TIMEOUT;
if docker ps | grep $PROXY_NAME ; then if docker ps | grep $PROXY_NAME ; then
echo "$PROXY_NAME restarted successful"; echo "$PROXY_NAME restarted successful";
break ; break ;
else else
echo "Restarting number is only: "$retries" so try again" echo "Restarting number is only: "$retries" so try again"
sleep $TIMEOUT;
fi fi
else else
echo "Reached retrying limit: "$RESTART" ,giving up, starting recocer previous state" echo "Reached retrying limit: "$RESTART" ,giving up, starting recocer previous state"

9
scripts/nginx_config_create.sh
View File

@@ -157,9 +157,14 @@ echo "ssl_certificate /etc/ssl/keys/$DOMAIN/fullchain.pem;
ssl_certificate_key /etc/ssl/keys/$DOMAIN/key.pem;" ssl_certificate_key /etc/ssl/keys/$DOMAIN/key.pem;"
else else
if []; then
echo "ssl_certificate /etc/ssl/keys/$DOMAIN/fullchain.pem;
ssl_certificate_key /etc/ssl/keys/$DOMAIN/key.pem;"
else
echo "ssl_certificate /etc/ssl/keys/fullchain.pem; echo "ssl_certificate /etc/ssl/keys/fullchain.pem;
ssl_certificate_key /etc/ssl/keys/key.pem;" ssl_certificate_key /etc/ssl/keys/key.pem;"
fi
fi fi
@@ -239,7 +244,7 @@ echo " proxy_pass http://$LOCAL_IP:$HTTPS_PORT;"
ALP_LOCAL_PORT=$HTTP_PORT ALP_LOCAL_PORT=$HTTP_PORT
fi; fi;
echo "location $ALP_LOCAL_PATH {" echo "location /$ALP_LOCAL_PATH {"
if [[ "$ALP_LOCAL_ALLOWED_NETWORK" != "" ]]; then if [[ "$ALP_LOCAL_ALLOWED_NETWORK" != "" ]]; then
@@ -260,7 +265,7 @@ echo " proxy_pass http://$LOCAL_IP:$HTTPS_PORT;"
proxy_set_header X-Forwarded-For "'$proxy_add_x_forwarded_for'"; proxy_set_header X-Forwarded-For "'$proxy_add_x_forwarded_for'";
proxy_set_header X-Forwarded-Proto "'$scheme'"; proxy_set_header X-Forwarded-Proto "'$scheme'";
proxy_set_header Upgrade "'$http_upgrade;'" proxy_set_header Upgrade "'$http_upgrade;'"
proxy_cookie_path $ALP_LOCAL_PATH $ALP_LOCAL_PATH; proxy_cookie_path /$ALP_LOCAL_PATH /$ALP_LOCAL_PATH;
proxy_set_header Connection "'$http_connection'"; proxy_set_header Connection "'$http_connection'";
proxy_connect_timeout 300; proxy_connect_timeout 300;
proxy_send_timeout 300; proxy_send_timeout 300;