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

Fixing if statement definitions.

Browse Source
This commit is contained in:
Gyorgy Berenyi
2021-12-02 13:25:16 +00:00
parent 28e70f5853
commit 04c3923e4f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
proxy.json
View File

@@ -1,6 +1,7 @@
{ {
"proxy_scheduler": { "proxy_scheduler": {
"DOCKER_REGISTRY_URL": "registry.format.hu", "DOCKER_REGISTRY_URL": "registry.format.hu",
"PROXY_TYPE": "",
"LETSENCRYPT_URL": "letsencrypt.org", "LETSENCRYPT_URL": "letsencrypt.org",
"CERT_DIR": "/keys", "CERT_DIR": "/keys",
"DOMAIN_DIR": "/domains", "DOMAIN_DIR": "/domains",

6
scripts/check_proxy_state.sh
View File

@@ -4,7 +4,7 @@ DATE=`date +%F-%H-%M-%S`
TIMEOUT=$TIMEOUT TIMEOUT=$TIMEOUT
RESTART=$RESTART RESTART=$RESTART
RESTART_COUNTER=0 RESTART_COUNTER=0
DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL REGISTRY_URL=$DOCKER_REGISTRY_URL
# Set env variables # Set env variables
DOMAIN="$1" DOMAIN="$1"
@@ -15,11 +15,11 @@ PROXY_CONFIG_DIR=$PROXY_CONFIG_DIR
# Setup docker registry url path # Setup docker registry url path
if [[ ! -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then if [[ ! -n "$REGISTRY_URL" ]] && [[ "$REGISTRY_URL" != "null" ]] ; then
SETUP="'/setup'"; SETUP="'/setup'";
else else
SETUP="setup"; SETUP="setup";
$DOCKER_REGISTRY_URL=""; $REGISTRY_URL="";
fi fi
service_exec="docker run --rm -v /etc/user/config/services/:/services/:ro -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker:ro registry.format.hu/setup /scripts/service-exec" service_exec="docker run --rm -v /etc/user/config/services/:/services/:ro -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker:ro registry.format.hu/setup /scripts/service-exec"