Run certificate check in the background during Nginx config creation

Merge branch 'master' of https://git.format.hu/format/proxy-scheduler

.drone.yml

@@ -0,0 +1,50 @@
+kind: pipeline
+type: kubernetes
+name: default
+
+node_selector:
+  physical-node: dev2
+
+trigger:
+  branch:
+    - master
+  event:
+    - push
+workspace:
+  path: /drone/src
+
+steps:
+  - name: build multiarch proxy-scheduler
+    image: docker.io/owncloudci/drone-docker-buildx:4
+    privileged: true
+    environment:
+      BUILDKIT_NO_HTTP2: "1" 
+    settings:
+      cache-from: [ "registry.dev.format.hu/proxy-scheduler" ]
+      registry: registry.dev.format.hu
+      repo: registry.dev.format.hu/proxy-scheduler
+      tags: latest
+      dockerfile: Dockerfile
+      username:
+        from_secret: dev-hu-registry-username
+      password: 
+        from_secret: dev-hu-registry-password
+      platforms:
+        - linux/amd64
+        - linux/arm64
+    
+  - name: pull image to dockerhub
+    image: docker.io/owncloudci/drone-docker-buildx:4
+    privileged: true
+    settings:
+      cache-from: [ "safebox/proxy-scheduler" ]
+      repo: safebox/proxy-scheduler
+      tags: latest
+      username:
+        from_secret: dockerhub-username
+      password: 
+        from_secret: dockerhub-password
+      platforms:
+        - linux/amd64
+        - linux/arm64
+        

Dockerfile

@@ -1,4 +1,6 @@
-FROM proxy-scheduler:latest
+FROM alpine
+RUN apk add --update --no-cache docker-cli inotify-tools openssl jq curl ca-certificates busybox-extras
 COPY scripts /scripts
+COPY firewall-letsencrypt.json /firewall-files/
 
 ENTRYPOINT ["/scripts/scheduler.sh"]

firewall-letsencrypt.json

@@ -0,0 +1,70 @@
+{
+    "main": {
+        "SERVICE_NAME": "firewalls",
+        "DOMAIN": "null"
+    },
+    "containers": [
+        {
+            "IMAGE": "safebox/firewall",
+            "NAME": "firewall",
+            "MEMORY": "64M",
+            "NETWORK": "host",
+            "SCALE": "0",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/run/",
+                    "DEST": "/run/",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/user/config/services",
+                    "DEST": "/services",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                }
+            ],
+            "PORTS": [],
+            "READYNESS": [
+                {
+                    "tcp": ""
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
+            ],
+            "ENVS": [
+                {
+                    "CHAIN": "DOCKER-USER"
+                },
+                {
+                    "SOURCE": "smarthostloadbalancer"
+                },
+                {
+                    "TARGET": "letsencrypt"
+                },
+                {
+                    "TYPE": "tcp"
+                },
+                {
+                    "TARGET_PORT": "80"
+                },
+                {
+                    "COMMENT": "letsencrypt"
+                }
+            ],
+            "EXTRA": "--privileged --rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        }
+    ]
+}

letsencrypt.json

@@ -1,49 +1,64 @@
 {
-	"main": {
-		"SERVICE_NAME": "letsencrypt",
-		"DOMAIN": "null" 
-	},
-	"networks": [
-		{
-			"NAME": "letsencrypt",
-			"DRIVER": "bridge",
-			"SUBNET": "172.18.254.0/24",	
-			"RANGE": "172.18.254.0/24",
-			"GATEWAY": "172.18.254.1"
-		}
-	],
-	"containers": [
-		{ 
-			"IMAGE": "registry.format.hu/letsencrypt",
-			"NAME": "letsencrypt",
-			"MEMORY": "64M",
-			"IP": "172.18.254.254",
-			"NETWORK": "letsencrypt",
-			"VOLUMES": [
-				{
-				"SOURCE": "/etc/ssl/keys/",
-				"DEST": "/acme.sh/",
-				"TYPE": "rw"
-				},
-				{	
-				"SOURCE": "/etc/user/config/domains",
-				"DEST": "/domains",
-				"TYPE": "ro"
-				}
-				],
-			"PORTS": [ ],
-			"ENV_FILES": [ "/etc/user/config/user.json" ],
-			"READYNESS": [
-			        {"tcp": ""},
-			        {"HTTP": ""},
-				{"EXEC": "/ready.sh"}
-				],
-			"EXTRA": "",
-			"DEPEND": "null",
-			"START_ON_BOOT": "false",
-			"CMD": "null",
-			"PRE_START": "null",
-			"POST_START": [ "firewall-29eexhrh" ]
-		}
-	]
-}
+    "main": {
+        "SERVICE_NAME": "letsencrypt",
+        "DOMAIN": "null"
+    },
+    "networks": [
+        {
+            "NAME": "letsencrypt",
+            "DRIVER": "bridge",
+            "SUBNET": "172.18.254.0/24",
+            "RANGE": "172.18.254.0/24",
+            "GATEWAY": "172.18.254.1"
+        }
+    ],
+    "containers": [
+        {
+            "IMAGE": "safebox/letsencrypt",
+            "NAME": "letsencrypt",
+            "MEMORY": "64M",
+            "IP": "172.18.254.254",
+            "NETWORK": "letsencrypt",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/system/data/ssl/keys/",
+                    "DEST": "/acme.sh/",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "SHARED",
+                    "DEST": "/var/tmp/shared",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/user/config/domains",
+                    "DEST": "/domains",
+                    "TYPE": "ro"
+                }
+            ],
+            "PORTS": [],
+            "ENV_FILES": [
+                "/etc/user/config/user.json"
+            ],
+            "READYNESS": [
+                {
+                    "tcp": ""
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
+            ],
+            "EXTRA": "",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": [
+                "firewall-letsencrypt"
+            ]
+        }
+    ]
+}

proxy-scheduler.json

@@ -1,67 +1,82 @@
 {
-        "main": {
-                "SERVICE_NAME": "proxy-scheduler",
-                "DOMAIN": "null"
-        },
-        "containers": [
+    "main": {
+        "SERVICE_NAME": "proxy-scheduler",
+        "DOMAIN": "null"
+    },
+    "containers": [
+        {
+            "IMAGE": "safebox/proxy-scheduler:latest",
+            "NAME": "proxy_scheduler",
+            "MEMORY": "64M",
+            "IP": "null",
+            "NETWORK": "host",
+            "VOLUMES": [
                 {
-                        "IMAGE": "registry.format.hu/proxy-scheduler:latest",
-                        "NAME": "proxy_scheduler-ifhiwhhg",
-                        "MEMORY": "64M",
-                        "IP": "null",
-                        "NETWORK": "host",
-                        "VOLUMES": [
-                                {
-                                "SOURCE": "/etc/user/config/domains",
-                                "DEST": "/domains",
-                                "TYPE": "ro"
-                                },
-                                {
-                                "SOURCE": "/etc/ssl/keys",
-                                "DEST": "/keys",
-                                "TYPE": "rw"
-                                },
-                                {
-                                "SOURCE": "/etc/ssl/certs/",
-                                "DEST": "/etc/ssl/certs/",
-                                "TYPE": "ro"
-                                },
-                                {
-                                "SOURCE": "/etc/system/config/public-proxy/nginx",
-                                "DEST": "/proxy_config",
-                                "TYPE": "rw"
-                                },
-                                {
-                                "SOURCE": "/etc/user/config/services/public-proxy.json",
-                                "DEST": "/public-proxy.json",
-                                "TYPE": "ro"
-                                },
-                                {
-                                "SOURCE": "/var/run/docker.sock",
-                                "DEST": "/var/run/docker.sock",
-                                "TYPE": "rw"
-                                },
-                                {
-                                "SOURCE": "/usr/bin/docker",
-                                "DEST": "/usr/bin/docker",
-                                "TYPE": "ro"
-                                }
-                                ],
-                        "PORTS": [ ],
-                        "READYNESS": [
-                                {"tcp": ""},
-                                {"HTTP": ""},
-                                {"EXEC": "/ready.sh"}
-                                ],
-                        "ENVS": [
-				 ],
-			"ENV_FILES": [ "/etc/system/config/proxy.json" ],
-                        "EXTRA": "null",
-                        "DEPEND": [ "public-proxy.networks.loadbalancer", "public-proxy.containers.loadbalancer-27dhuwdh" ],
-                        "START_ON_BOOT": "true",
-                        "CMD": "null",
-                        "PRE_START": "null",
-                        "POST_START": "null"
+                    "SOURCE": "SHARED",
+                    "DEST": "/var/tmp/shared",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/user/config/services",
+                    "DEST": "/etc/user/config/services",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/user/config/domains",
+                    "DEST": "/domains",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/etc/system/data/ssl/keys",
+                    "DEST": "/keys",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/system/data/ssl/certs/",
+                    "DEST": "/etc/ssl/certs/",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/etc/system/config/public-proxy/nginx",
+                    "DEST": "/proxy_config",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/user/config/services/public-proxy.json",
+                    "DEST": "/public-proxy.json",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
                 }
-        ]
-}
+            ],
+            "PORTS": [],
+            "READYNESS": [
+                {
+                    "tcp": ""
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
+            ],
+            "ENVS": [],
+            "ENV_FILES": [
+                "/etc/system/config/proxy.json"
+            ],
+            "EXTRA": "null",
+            "DEPEND": [
+                "public-proxy.networks.loadbalancer",
+                "public-proxy.containers.loadbalancer-27dhuwdh"
+            ],
+            "START_ON_BOOT": "true",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        }
+    ]
+}

proxy.json

@@ -1,49 +1,49 @@
 {
-	"firewall_loadbalancer_wireguard_prerouting": {
-		"NAME": "wireguard_proxy_client",
-		"PREROUTING": "true",
-		"TARGET_IP": "172.18.100.2",
-		"TYPE": "tcp",
-		"SOURCE_PORT_1": "80",
-		"SOURCE_PORT_2": "443",
-		"TARGET_PORT_1": "80",
-		"TARGET_PORT_2": "443",
-		"COMMENT": "edeg3e98"
-		},
-	"firewall_loadbalancer_wireguard_postrouting": {
-		"NAME": "wireguard_proxy_client",
-		"POSTROUTING": "true",
-		"TARGET_IP": "172.18.100.0",
-		"TARGET_PORT_1": "80",
-		"TARGET_PORT_2": "443",
-		"TYPE": "tcp",
-		"COMMENT": "edeg3e98"
-		},
-	"proxy_scheduler": {
-		"DOCKER_REGISTRY_URL": "registry.format.hu",
-		"CERT_DIR": "/keys",
-		"DOMAIN_DIR": "/domains",
-		"PROXY_SERVICE_FILE": "public-proxy.json",
-		"PROXY_CONFIG_DIR": "/proxy_config",
-		"PROXY_TYPE": "haproxy",
-		"TIMEOUT": "5",
-		"RESTART": "3",
-		"ROLE": "backend-proxy",
-		"SERVICE_NAME": "public-proxy"
-	 	},
-	"proxy_scheduler_local": {
-		"DOCKER_REGISTRY_URL": "registry.format.hu",
-		"PROXY_TYPE": "",
-		"GENERATE_CERTIFICATE": "true",
-		"LETSENCRYPT_URL": "letsencrypt.org",
-		"LETSENCRYPT_SERVICE_NAME": "letsencrypt.json",
-		"CERT_DIR": "/keys",
-		"DOMAIN_DIR": "/domains",
-		"PROXY_SERVICE_FILE": "public-proxy.json",
-		"PROXY_CONFIG_DIR": "/proxy_config",
-		"TIMEOUT": "5",
-		"RESTART": "3",
-		"ROLE": "backend-proxy",
-		"SERVICE_NAME": "public-proxy"
-		}
-}
+    "firewall_loadbalancer_wireguard_prerouting": {
+        "NAME": "wireguard_proxy_client",
+        "PREROUTING": "true",
+        "TARGET_IP": "172.18.100.2",
+        "TYPE": "tcp",
+        "SOURCE_PORT_1": "80",
+        "SOURCE_PORT_2": "443",
+        "TARGET_PORT_1": "80",
+        "TARGET_PORT_2": "443",
+        "COMMENT": "edeg3e98"
+    },
+    "firewall_loadbalancer_wireguard_postrouting": {
+        "NAME": "wireguard_proxy_client",
+        "POSTROUTING": "true",
+        "TARGET_IP": "172.18.100.0",
+        "TARGET_PORT_1": "80",
+        "TARGET_PORT_2": "443",
+        "TYPE": "tcp",
+        "COMMENT": "edeg3e98"
+    },
+    "proxy_scheduler": {
+        "DOCKER_REGISTRY_URL": "safebox",
+        "CERT_DIR": "/keys",
+        "DOMAIN_DIR": "/domains",
+        "PROXY_SERVICE_FILE": "public-proxy.json",
+        "PROXY_CONFIG_DIR": "/proxy_config",
+        "PROXY_TYPE": "haproxy",
+        "TIMEOUT": "5",
+        "RESTART": "10",
+        "ROLE": "backend-proxy",
+        "SERVICE_NAME": "public-proxy"
+    },
+    "proxy_scheduler_local": {
+        "DOCKER_REGISTRY_URL": "safebox",
+        "PROXY_TYPE": "",
+        "GENERATE_CERTIFICATE": "true",
+        "LETSENCRYPT_URL": "letsencrypt.org",
+        "LETSENCRYPT_SERVICE_NAME": "letsencrypt.json",
+        "CERT_DIR": "/keys",
+        "DOMAIN_DIR": "/domains",
+        "PROXY_SERVICE_FILE": "public-proxy.json",
+        "PROXY_CONFIG_DIR": "/proxy_config",
+        "TIMEOUT": "5",
+        "RESTART": "3",
+        "ROLE": "backend-proxy",
+        "SERVICE_NAME": "public-proxy"
+    }
+}

scripts/check_certificates.sh

@@ -2,147 +2,218 @@
 
 # Set env variables
 
-	SERVICE_FILES=$SERVICE_FILES
-	GENERATE_CERTIFICATE=$GENERATE_CERTIFICATE
-	DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL
-	LETSENCRYPT_URL=$LETSENCRYPT_URL
-	LETSENCRYPT_SERVICE_NAME=$LETSENCRYPT_SERVICE_NAME
-	CERT_DIR=$CERT_DIR
-	DOMAIN_DIR=$DOMAIN_DIR
-	DOMAIN=$1
-	DOMAIN_CERT_DIR=$CERT_DIR/$DOMAIN
-	TIMEOUT=$TIMEOUT
-	RESTART=$RESTART
+SERVICE_FILES=$SERVICE_FILES
+GENERATE_CERTIFICATE=$GENERATE_CERTIFICATE
+DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL
+LETSENCRYPT_URL=$LETSENCRYPT_URL
+LETSENCRYPT_SERVICE_NAME=$LETSENCRYPT_SERVICE_NAME
+CERT_DIR=$CERT_DIR
+DOMAIN_DIR=$DOMAIN_DIR
+DOMAIN=$1
+DOMAIN_CERT_DIR=$CERT_DIR/$DOMAIN
+TIMEOUT=$TIMEOUT
+RESTART=$RESTART
 
-# Setup docker registry url path
+SETUP_VERSION=${SETUP_VERSION:-latest}
+LOG_DIR=/var/tmp/shared/output
+LOG_FILE=$LOG_DIR/letsencrypt.txt
+LETSENCRYPT_OUTPUT=$LOG_DIR/letsencrypt.json
+DATE=$(date +"%Y-%m-%d-%H-%M")
 
-if [[ -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then
-	SETUP="/setup";
-else
-	SETUP="setup";
-	DOCKER_REGISTRY_URL="";
-fi
+create_json() {
+
+    if [ ! -f $LETSENCRYPT_OUTPUT ]; then
+        install -m 664 -g 65534 /dev/null $LETSENCRYPT_OUTPUT
+        echo '{}' >$LETSENCRYPT_OUTPUT
+    fi
+
+    TMP_FILE=$(mktemp)
+    jq '
+      if . == null or . == [] then 
+        {"'$DOMAIN'":{"date": "'$DATE'", "status": "'$STATUS'", "log": "'$LOG'"}}
+    else 
+      . + {"'$DOMAIN'": {"date": "'$DATE'", "status": "'$STATUS'", "log": "'$LOG'"}}
+      end
+    ' $LETSENCRYPT_OUTPUT >$TMP_FILE
+    cat $TMP_FILE >$LETSENCRYPT_OUTPUT
+    rm $TMP_FILE
+}
 
 # Setting service files path
-
 if [ "$SERVICE_FILES" == "" ]; then
-	SERVICE_FILES=/etc/user/config/services
+    SERVICE_FILES=/etc/user/config/services
+fi
+
+if [ "$SOURCE" == "" ]; then
+    SOURCE=/etc/user/config
+fi
+
+# Setup docker registry url path
+if [[ -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]]; then
+    SETUP="/setup"
+else
+    SETUP="setup"
+    DOCKER_REGISTRY_URL=""
+fi
+
+if [ "$SETUP_VERSION" == "latest" ]; then
+    VOLUME_MOUNTS="
+--mount src=SYSTEM_DATA,dst=/etc/ssl/certs,volume-subpath=ssl/certs,ro \
+--mount src=SYSTEM_DATA,dst=/etc/dns/hosts.local,volume-subpath=dns/hosts.local,ro \
+--mount src=USER_CONFIG,dst=/services,volume-subpath=services/tmp \
+--mount src=USER_CONFIG,dst=/etc/user/config/system.json,volume-subpath=system.json,ro \
+--mount src=USER_CONFIG,dst=/etc/user/config/user.json,volume-subpath=user.json,ro \
+"
+else
+    VOLUME_MOUNTS="
+ -v /etc/system/data/dns:/etc/dns:rw \
+ -v /etc/ssl/certs:/etc/ssl/certs:ro \
+ -v /etc/user/config/user.json:/etc/user/config/user.json:ro \
+ -v /etc/user/config/system.json:/etc/user/config/system.json:ro \
+ -v /etc/user/config/services/:/services/:ro \
+ -v /etc/user/config/services/tmp:/services/tmp:rw \
+"
 fi
 
 service_exec="docker run --rm \
- -w /services/ \
- -v $SERVICE_FILES/:/services/:ro \
- -v $SERVICE_FILES/tmp/:/services/tmp/:rw \
- -v /var/run/docker.sock:/var/run/docker.sock \
- -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"
+-w /services/ \
+$VOLUME_MOUNTS
+-v /var/run/docker.sock:/var/run/docker.sock \
+--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
+$DOCKER_REGISTRY_URL$SETUP:$SETUP_VERSION"
 
 letsencrypt_certificates() {
 
-	local RUNNING_CONTAINERS;
+    #cd /
 
-	cd /
+    for retries in $(seq 0 $((RESTART + 1))); do
+        if [[ $retries -le $RESTART ]]; then
 
-	# Check services with running containers by roles
-	for CONTAINER in $(jq -r --arg ROLE $ROLE '.containers[] | select(.ROLES==$ROLE)' /$PROXY_SERVICE_FILE | jq -r .NAME) ; do
-		UP=$(docker ps | grep $CONTAINER | grep Up | wc -l)
-		RUNNING_CONTAINERS=$((RUNNING_CONTAINERS + UP))
-	done;
+            LETS_ENCRYPT_VALUE="$(docker ps | grep letsencrypt | grep Up | wc -l)"
+            if [[ $LETS_ENCRYPT_VALUE -eq 0 ]]; then
+                echo "Starting letsencrypt process"
+                mkdir -p $SERVICE_FILES/tmp/tmp
+                cp -av /firewall-files/firewall-letsencrypt.json $SERVICE_FILES/tmp/
+                LETSENCRYPT_TEMP_SERVICE_FILE=$(mktemp -p $SERVICE_FILES/tmp/)
+                ENVS='[                                                              
+                                        {"DOMAIN": "'$DOMAIN'"},                                     
+                                        {"TIMEOUT": "'$TIMEOUT'"},                                   
+                                        {"RESTART": "'$RESTART'"}                                    
+                                ]'
+                VOLUMES='                                                            
+                                        {                                                            
+                                                "SOURCE": "/etc/user/config/user.json",              
+                                                "DEST": "/etc/user/config/user.json",                
+                                                "TYPE": "ro"                                         
+                                        }                                                            
+                                '
+                jq '.containers[0].ENVS |='"$ENVS"' | .containers[0].VOLUMES[.containers[0].VOLUMES|length]|='"$VOLUMES" $SERVICE_FILES/$LETSENCRYPT_SERVICE_NAME >$LETSENCRYPT_TEMP_SERVICE_FILE.json
+                $service_exec $(basename $LETSENCRYPT_TEMP_SERVICE_FILE) start info prechecked
+                rm -v $SERVICE_FILES/tmp/firewall-letsencrypt.json
+                break
+            else
+                echo "Waiting "$TIMEOUT" second for previous letsencrypt process ending"
+                sleep $TIMEOUT
 
-	# In case of no running proxies found, try to start the service
-	if [[ "$RUNNING_CONTAINERS" -eq 0 ]] ; then 
-		echo "No running proxies found, create self signed cetificate";
-	fi;
-	
-	for retries in $(seq 0 $((RESTART + 1))); do
-		if [[ $retries -le $RESTART ]] ; then
-	
-			LETS_ENCRYPT_VALUE="$(docker ps | grep letsencrypt | grep Up | wc -l)";
-			if [[ $LETS_ENCRYPT_VALUE -eq 0 ]] ; then
-				echo "Starting letsencrypt process";
-				$service_exec $LETSENCRYPT_SERVICE_NAME start info;
-				break;
-			else
-				echo "Waiting "$TIMEOUT" second for previous letsencrypt process ending";
-				sleep $TIMEOUT;
+                echo "Not reached number of restart limit: "$RESTART" sleep "$TIMEOUT" and try again to start lets encrypt process."
+            fi
+        else
+            echo "Reached retrying limit: "$RESTART" ,giving up to start lets encrypt process, try self sign the certificate"
+        fi
 
-				echo "Not reached number of restart limit: "$RESTART" sleep "$TIMEOUT" and try again to start lets encrypt process." 
-			fi
-		else
-				echo "Reached retrying limit: "$RESTART" ,giving up to start lets encrypt process, try self sign the certificate";
-		fi
-
-	done
+    done
 
 }
 
-create_self_signed_certificate() { 
+create_self_signed_certificate() {
 
-# Check any certificate exxits
+    # Check any certificate exists
 
-	if [[ ! -f $DOMAIN_CERT_DIR/key.pem && ! -f $DOMAIN_CERT_DIR/fullchain.pem && ! -f $DOMAIN_CERT_DIR/cert.pem ]] ; then
+    if [[ ! -f $DOMAIN_CERT_DIR/key.pem && ! -f $DOMAIN_CERT_DIR/fullchain.pem && ! -f $DOMAIN_CERT_DIR/cert.pem ]]; then
 
-		# generate key
-		echo "No any certificates found, generate self signed";
-		openssl req -x509 -newkey rsa:4096 -keyout $DOMAIN_CERT_DIR/key.pem -out $DOMAIN_CERT_DIR/cert.pem -days 365 -sha256 -nodes -subj "/CN=$DOMAIN";
-		cp -a $DOMAIN_CERT_DIR/cert.pem $DOMAIN_CERT_DIR/fullchain.pem;
-		touch $DOMAIN_CERT_DIR/new_certificate;
+        # generate key
+        echo "No any certificates found, generate self signed"
+        openssl req -x509 -newkey rsa:4096 -keyout $DOMAIN_CERT_DIR/key.pem -out $DOMAIN_CERT_DIR/cert.pem -days 365 -sha256 -nodes -subj "/CN=$DOMAIN"
+        cp -a $DOMAIN_CERT_DIR/cert.pem $DOMAIN_CERT_DIR/fullchain.pem
 
-	fi
+    fi
 
 }
 
 if [ ! -d "$DOMAIN_CERT_DIR" ]; then
-	echo "$DOMAIN not contains certificates, creates new."
-	mkdir -p $DOMAIN_CERT_DIR;
+    echo "$DOMAIN not contains certificates, creates new."
+    mkdir -p $DOMAIN_CERT_DIR
 fi
 
 if [ ! -f "$DOMAIN_CERT_DIR/dhparam.pem" ]; then
-	# generate dhparam file
-	openssl dhparam -dsaparam -out $DOMAIN_CERT_DIR/dhparam.pem 4096; 
-fi
+    # generate dhparam file
+    openssl dhparam -dsaparam -out $DOMAIN_CERT_DIR/dhparam.pem 4096
+    create_self_signed_certificate
 
-if [ "$GENERATE_CERTIFICATE" == "true" ]; then
+    PROXY_NAMES=""
+    # Check services with running containers by roles
+    for CONTAINER in $(jq -r --arg ROLE $ROLE '.containers[] | select(.ROLES==$ROLE)' /$PROXY_SERVICE_FILE | jq -r .NAME); do
+        PROXY_NAMES=$PROXY_NAMES" "$CONTAINER
+    done
 
-	create_self_signed_certificate;
-	sleep 10;
-	
-	CURL_CHECK="curl -s -o /dev/null -w "%{http_code}" https://$LETSENCRYPT_URL";
-
-	if [[ "$(eval $CURL_CHECK)" == "200" ]] ; then
-		
-		file="$DOMAIN_CERT_DIR/letsencrypt"
-		{
-		echo "{ \"DOMAIN\": \"$DOMAIN\" }"
-		} >> "$file";
-		
-		DOMAIN_CHECK="curl -s -o /dev/null -w "%{http_code}" http://$DOMAIN";
-		if [[ "$(eval $DOMAIN_CHECK)" == "200" || "$(eval $DOMAIN_CHECK)" == "301" ]] ; then
-			letsencrypt_certificates;
-			echo "Started letsencrypt for domain: $DOMAIN first time"
-		else
-			echo "Not starting letsencrypt, waiting $TIMEOUT seconds"
-			for retries in $(seq 0 $((RESTART + 1))); do
-				if [[ $retries -le $RESTART ]] ; then
-					sleep $TIMEOUT;
-					echo "Starting letsencrypt process again";
-					if [[ "$(eval $DOMAIN_CHECK)" == "200" || "$(eval $DOMAIN_CHECK)" == "301" ]] ; then
-						letsencrypt_certificates;
-						echo "Started letsencrypt for domain: $DOMAIN second time"
-						break;
-					else
-						echo "Waiting "$TIMEOUT" second for starting proxies";
-						sleep $TIMEOUT;
-						echo "Not reached number of restart limit: "$RESTART" sleep "$TIMEOUT" and try again to start lets encrypt process."
-					fi
-				else
-					echo "Reached retrying limit: "$RESTART" ,giving up to start lets encrypt process, try self sign the certificate";
-				fi
-
-			done
-		fi		
-	fi
+    for NAME in $(echo $PROXY_NAMES); do
+        RUNNING_CONTAINER=$(docker ps | grep $NAME | grep Up)
+        if [ "$RUNNING_CONTAINER" != "" ]; then
+            echo "Restarting $NAME"
+            docker restart $NAME
+        else
+            echo "Starting $NAME"
+            docker start $NAME
+        fi
+        docker ps | grep $NAME
+    done
+
+fi
+
+if [ "$GENERATE_CERTIFICATE" == "true" ] && [ "$DOMAIN" != "localhost" ]; then
+
+    CURL_CHECK="curl -s -o /dev/null -w "%{http_code}" https://$LETSENCRYPT_URL"
+
+    if [[ "$(eval $CURL_CHECK)" == "200" ]]; then
+
+        file="$DOMAIN_CERT_DIR/letsencrypt"
+        {
+            echo "{ \"DOMAIN\": \"$DOMAIN\" }"
+        } >>"$file"
+
+        if [ ! -f $LETSENCRYPT_OUTPUT ]; then
+            install -m 664 -g 65534 /dev/null $LETSENCRYPT_OUTPUT
+            echo '{}' >$LETSENCRYPT_OUTPUT
+        fi
+        DOMAIN_CHECK="curl -s -o /dev/null -w "%{http_code}" http://$DOMAIN"
+        if [[ "$(eval $DOMAIN_CHECK)" == "200" || "$(eval $DOMAIN_CHECK)" == "301" ]]; then
+            echo "DOMAIN CHECK: $(eval $DOMAIN_CHECK)"
+            letsencrypt_certificates
+            echo "Started letsencrypt for domain: $DOMAIN first time"
+        else
+            echo "Not starting letsencrypt, waiting $TIMEOUT seconds"
+            for retries in $(seq 0 $((RESTART + 1))); do
+                if [[ $retries -le $RESTART ]]; then
+                    sleep $TIMEOUT
+                    echo "Starting letsencrypt process again"
+                    if [[ "$(eval $DOMAIN_CHECK)" == "200" || "$(eval $DOMAIN_CHECK)" == "301" ]]; then
+                        echo "DOMAIN CHECK: $(eval $DOMAIN_CHECK)"
+                        letsencrypt_certificates
+                        echo "Started letsencrypt for domain: $DOMAIN second time"
+                        break
+                    else
+                        echo "Waiting "$TIMEOUT" second for starting proxies"
+                        sleep $TIMEOUT
+                        echo "Not reached number of restart limit: "$RESTART" sleep "$TIMEOUT" and try again to start lets encrypt process."
+                    fi
+                else
+                    LOG=$(echo "The domain '$DOMAIN' could not reachable. Reached retrying limit: '$RESTART', giving up to start lets encrypt process, try self sign the certificate" | base64 -w0)
+                    STATUS="failed"
+                    create_json $DOMAIN $STATUS "$LOG"
+                fi
+
+            done
+        fi
+    fi
 
 fi

scripts/check_proxy_state.sh

@@ -20,6 +20,7 @@ ROLE=$ROLE
 SERVICE_NAME=$SERVICE_NAME
 PROXY_CONFIG_DIR=$PROXY_CONFIG_DIR
 
+SETUP_VERSION=${SETUP_VERSION:-latest};
 
 # Setup docker registry url path
 
@@ -76,9 +77,8 @@ service_exec="docker run --rm \
  -v /etc/user/config/services/:/services/:ro \
  -v /etc/user/config/services/tmp/:/services/tmp/:rw \
  -v /var/run/docker.sock:/var/run/docker.sock \
- -v /usr/bin/docker:/usr/bin/docker:ro  \
  --env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
- $DOCKER_REGISTRY_URL$SETUP"
+ $DOCKER_REGISTRY_URL$SETUP:$SETUP_VERSION"
 
 do_proxy_restart() { 
 
@@ -86,24 +86,32 @@ do_proxy_restart() {
 
 
 	for PROXY_NAME in $NAMES ; do 
-		docker stop $PROXY_NAME;
-		docker start $PROXY_NAME;
-		sleep $TIMEOUT;
-		if docker ps | grep $PROXY_NAME ; then
-			echo "$PROXY_NAME restarted successful";
-		else 
+		
+		DO_RESTART="true";
+		if [ "$FORCE_RESTART" != "true" ]; then
+			docker stop $PROXY_NAME;
+			docker start $PROXY_NAME;
+			sleep $TIMEOUT;
+			
+			if docker ps | grep $PROXY_NAME | grep Up ; then
+				echo "$PROXY_NAME restarted successful";
+				DO_RESTART="false";
+			fi
+		fi
+		
+		if [ "$DO_RESTART" == "true" ]; then
 			for retries in $(seq 0 $((RESTART + 1))); do
 				if [[ $retries -le $RESTART ]] ; then
 					echo "Proxy "$PROXY_NAME" restarting in progress";
 					$service_exec $SERVICE_NAME.containers.$PROXY_NAME stop force;
 					
-					# finding network name for starting affected network
-					NETWORK_NAME=$(jq -r --arg NAME $PROXY_NAME '.containers[] | select(.NAME==$NAME)' $PROXY_SERVICE_FILE | jq -r .NETWORK)
+					## finding network name for starting affected network
+					#NETWORK_NAME=$(jq -r --arg NAME $PROXY_NAME '.containers[] | select(.NAME==$NAME)' $PROXY_SERVICE_FILE | jq -r .NETWORK)
+					#$service_exec $SERVICE_NAME.networks.$NETWORK_NAME start
 					
-					$service_exec $SERVICE_NAME.networks.$NETWORK_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 | grep Up ; then
 						echo "$PROXY_NAME restarted successful";
 						break ;
 					else	
@@ -116,7 +124,6 @@ do_proxy_restart() {
 			done
 		fi
 	done
-	
 }
 
 check_domain() {
@@ -178,7 +185,7 @@ elif [[ "$RUNNING_CONTAINERS" -eq 0 ]] ; then
 	
 	for proxies in $CONTAINERS ; do 
 
-		if docker ps | grep $proxies ; then
+		if docker ps | grep $proxies | grep Up; then
 			echo "$proxies started successful";
 		else 
 			echo "$proxies starting was unsuccesful";
@@ -196,7 +203,7 @@ elif [[ "$RUNNING_CONTAINERS" -eq 1 ]] ; then
 			
 			do_proxy_restart $proxies;
 			
-			if docker ps | grep $proxies ; then
+			if docker ps | grep $proxies | grep Up ; then
 				echo "$proxies started successful";
 			else 
 				echo "$proxies starting was unsuccesful";
@@ -211,7 +218,7 @@ elif [[ "$RUNNING_CONTAINERS" -eq 1 ]] ; then
 	# At last need to restart the only one running proxy when the others started successful.
 	for CHECK_PROXIES in $CONTAINERS ; do
 		if [[ $CHECK_PROXIES != $ONLY_RUNNING_PROXY_NAME ]] ; then
-			if docker ps | grep $CHECK_PROXIES ; then
+			if docker ps | grep $CHECK_PROXIES | grep Up ; then
 				echo "Not running proxies successfuly started, let's start the only running one.";
 				do_proxy_restart $ONLY_RUNNING_PROXY_NAME;
 			else

scripts/config_haproxy_create.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Initial parameters
-DATE=`date +%F-%H-%M-%S`
+DATE=$(date +%F-%H-%M-%S)
 
 DOMAIN=$1
 
@@ -19,113 +19,162 @@ cp -a /scripts/haproxy_template.cfg $PROXY_CONFIG_DIR/haproxy.cfg
 
 {
 
-echo "frontend http
-";
+    echo "frontend http
+"
 
-cat "$global_http"
-echo 
+    cat "$global_http"
+    echo
 
-#echo "acl letsencrypt path_beg /.well-known/acme-challenge/";
+    #echo "acl letsencrypt path_beg /.well-known/acme-challenge/";
 
-echo 
+    echo
 
-for i in `ls $DOMAIN_DIR|cut -d / -f2` ;  do
-  
-        if [[ "$(jq -r .REDIRECT_HTTPS $i)" != "" && "$(jq -r .HTTP_PORT $i)" != "" && "$(jq -r .DOMAIN $i)" != "letsencrypt" ]]
-        then    
-            echo "redirect prefix https://$(jq -r .REDIRECT_HTTPS $i) code 301 if { hdr(host) -i $(jq -r .DOMAIN $i) }";
+    for i in $(ls $DOMAIN_DIR | cut -d / -f2); do
+
+        DOMAIN_NAME=$(jq -r .DOMAIN $i)
+        if [[ "$(jq -r .REDIRECT_HTTPS $i)" != "" && "$(jq -r .HTTP_PORT $i)" != "" && "$DOMAIN_NAME" != "letsencrypt" ]]; then
+            echo "redirect prefix https://$(jq -r .REDIRECT_HTTPS $i) code 301 if { hdr(host) -i $DOMAIN_NAME }"
         fi
-done
-echo
+    done
+    echo
 
-for i in `ls $DOMAIN_DIR|cut -d / -f2` ;  do
+    for i in $(ls $DOMAIN_DIR | cut -d / -f2); do
 
-	if [[ "$(jq -r .DOMAIN $i)" != "" && "$(jq -r .HTTP_PORT $i)" != "" && "$(jq -r .DOMAIN $i)" != "letsencrypt" ]]
-	then
-		echo "acl $(jq -r .DOMAIN $i)_http hdr(host) -i $(jq -r .DOMAIN $i)";
-	fi
+        DOMAIN_NAME=$(jq -r .DOMAIN $i)
+        if [[ "$DOMAIN_NAME" != "" && "$(jq -r .HTTP_PORT $i)" != "" && "$DOMAIN_NAME" != "letsencrypt" ]]; then
 
-	if [[ "$(jq -r .DOMAIN $i)" != "letsencrypt"  && "$(jq -r .HTTP_PORT $i)" != "" && "$(jq -r .ALIASES_HTTP[] $i)" != "" ]]
-	then
-		ALIASES_LIST=$(jq -r .ALIASES_HTTP[] $i)
-		for ALIAS in $ALIASES_LIST
-		do
-		 	echo "acl $(jq -r .DOMAIN $i)_http hdr(host) -i $ALIAS";
-		done
-	fi
+            TLD="$(echo $DOMAIN_NAME | rev | cut -d '.' -f1 | rev)"
+            WILDCARD=$(echo $DOMAIN_NAME | grep '*')
 
-done
+            if [ "$WILDCARD" != "" ]; then
+                HOST=$(echo $DOMAIN_NAME | rev | cut -d '.' -f2- | rev | cut -d '.' -f2-)
+                echo "acl $HOST."$TLD"_http hdr(host) -m reg -i ^[^\.]+\."$HOST"\."$TLD"$"
+            else
+                echo "acl "$DOMAIN_NAME"_http hdr(host) -i $DOMAIN_NAME"
+            fi
+        fi
 
-echo 
+        if [[ "$DOMAIN_NAME" != "letsencrypt" && "$(jq -r .HTTP_PORT $i)" != "" && "$(jq -r .ALIASES_HTTP[] $i)" != "" ]]; then
+            ALIASES_LIST=$(jq -r .ALIASES_HTTP[] $i)
+            for ALIAS in $ALIASES_LIST; do
+                echo "acl "$DOMAIN_NAME"_http hdr(host) -i $ALIAS"
+            done
+        fi
 
-#echo "use_backend letsencrypt_http if letsencrypt"
+    done
 
-for i in `ls $DOMAIN_DIR|cut -d / -f2` ;  do
-        
-	if [[ "$(jq -r .DOMAIN $i)" != "" && "$(jq -r .HTTP_PORTS $i)" != "" && "$(jq -r .DOMAIN $i)" != "letsencrypt" ]]
-	then
-		echo "use_backend $(jq -r .DOMAIN $i)_http if $(jq -r .DOMAIN $i)_http"; 
-	fi
-done
+    echo
 
-echo
+    #echo "use_backend letsencrypt_http if letsencrypt"
 
-for i in `ls $DOMAIN_DIR|cut -d / -f2` ;  do
+    for i in $(ls $DOMAIN_DIR | cut -d / -f2); do
 
-      	if [[ "$(jq -r .DOMAIN $i)" != "" && "$(jq -r .HTTP_PORT $i)" != "" ]]
-      	then
-      		echo "backend $(jq -r .DOMAIN $i)_http";
-		echo "	mode http";
-		echo "	server $(jq -r .DOMAIN $i) $(jq -r .LOCAL_NAME $i):$(jq -r .HTTP_PORT $i) send-proxy";
-	fi
-done
+        DOMAIN_NAME=$(jq -r .DOMAIN $i)
+        TLD="$(echo $DOMAIN_NAME | rev | cut -d '.' -f1 | rev)"
+        WILDCARD=$(echo $DOMAIN_NAME | grep '*')
 
-echo
+        if [[ "$DOMAIN_NAME" != "" && "$(jq -r .HTTP_PORT $i)" != "" && "$DOMAIN_NAME" != "letsencrypt" ]]; then
+            if [ "$WILDCARD" != "" ]; then
+                HOST=$(echo $DOMAIN_NAME | rev | cut -d '.' -f2- | rev | cut -d '.' -f2-)
+                echo "use_backend $HOST."$TLD"_http if $HOST."$TLD"_http"
+            else
+                echo "use_backend "$DOMAIN_NAME"_http if "$DOMAIN_NAME"_http"
+            fi
+        fi
+    done
 
-echo "frontend https
-";
+    echo
 
-cat "$global_https"
-echo 
+    for i in $(ls $DOMAIN_DIR | cut -d / -f2); do
 
-for i in `ls $DOMAIN_DIR|cut -d / -f2` ;  do
+        DOMAIN_NAME=$(jq -r .DOMAIN $i)
+        TLD="$(echo $DOMAIN_NAME | rev | cut -d '.' -f1 | rev)"
+        WILDCARD=$(echo $DOMAIN_NAME | grep '*')
 
-	if [[ "$(jq -r .DOMAIN $i)" != "" && "$(jq -r .HTTPS_PORT $i)" != "" && "$(jq -r .DOMAIN $i)" != "letsencrypt" ]]
-	then
-		echo "acl $(jq -r .DOMAIN $i)_https req_ssl_sni -i $(jq -r .DOMAIN $i)";
-	fi
-	if [[ "$(jq -r .HTTPS_PORT $i)" != "" && "$(jq -r .ALIASES_HTTPS[] $i)" != "" ]]
-	then
-		 ALIASES_LIST=$(jq -r .ALIASES_HTTPS[] $i)
-	         for ALIAS in $ALIASES_LIST
-	         do
-	                   echo "acl $(jq -r .DOMAIN $i)_https req_ssl_sni -i $ALIAS";
-	         done
-	 fi
-done
+        if [[ "$DOMAIN_NAME" != "" && "$(jq -r .HTTP_PORT $i)" != "" ]]; then
+            if [ "$WILDCARD" != "" ]; then
+                HOST=$(echo $DOMAIN_NAME | rev | cut -d '.' -f2- | rev | cut -d '.' -f2-)
+                echo "backend $HOST."$TLD"_http"
+                echo " mode http"
+                echo " server $HOST.$TLD $(jq -r .LOCAL_NAME $i):$(jq -r .HTTP_PORT $i) send-proxy"
+            else
+                echo "backend "$DOMAIN_NAME"_http"
+                echo " mode http"
+                echo " server $DOMAIN_NAME $(jq -r .LOCAL_NAME $i):$(jq -r .HTTP_PORT $i) send-proxy"
+            fi
+        fi
+    done
 
-echo 
+    echo
 
-for i in `ls $DOMAIN_DIR|cut -d / -f2` ;  do
+    echo "frontend https"
 
-	if [[ "$(jq -r .DOMAIN $i)" != "" && "$(jq -r .HTTPS_PORT $i)" != "" && "$(jq -r .DOMAIN $i)" != "letsencrypt" ]]
-	then
-		echo "use_backend $(jq -r .DOMAIN $i)_https if $(jq -r .DOMAIN $i)_https"; 
-	fi
-done
+    echo
 
-echo 
+    cat "$global_https"
+    echo
 
-for i in `ls $DOMAIN_DIR|cut -d / -f2` ;  do
+    for i in $(ls $DOMAIN_DIR | cut -d / -f2); do
+        DOMAIN_NAME=$(jq -r .DOMAIN $i)
+        TLD="$(echo $DOMAIN_NAME | rev | cut -d '.' -f1 | rev)"
+        WILDCARD=$(echo $DOMAIN_NAME | grep '*')
 
-      	if [[ "$(jq -r .DOMAIN $i)" != "" && "$(jq -r .HTTPS_PORT $i)" != "" && "$(jq -r .DOMAIN $i)" != "letsencrypt" ]]
-      	then
-      		echo "backend $(jq -r .DOMAIN $i)_https";
-		echo "	option ssl-hello-chk";
-		echo "	mode tcp";
-		echo "	server $(jq -r .DOMAIN $i) $(jq -r .LOCAL_NAME $i):$(jq -r .HTTPS_PORT $i) check send-proxy";
-	fi
-done
+        if [[ "$DOMAIN_NAME" != "" && "$(jq -r .HTTPS_PORT $i)" != "" && "$DOMAIN_NAME" != "letsencrypt" ]]; then
 
-} >> "$file";
-echo "$DOMAIN" >> $PROXY_CONFIG_DIR/new_config
+            if [ "$WILDCARD" != "" ]; then
+                HOST=$(echo $DOMAIN_NAME | rev | cut -d '.' -f2- | rev | cut -d '.' -f2-)
+                echo "acl $HOST."$TLD"_https req_ssl_sni -i ^[^\.]+\.$HOST\."$TLD"$"
+            else
+                echo "acl "$DOMAIN_NAME"_https req_ssl_sni -i $DOMAIN_NAME"
+            fi
+        fi
+        if [[ "$(jq -r .HTTPS_PORT $i)" != "" && "$(jq -r .ALIASES_HTTPS[] $i)" != "" ]]; then
+            ALIASES_LIST=$(jq -r .ALIASES_HTTPS[] $i)
+            for ALIAS in $ALIASES_LIST; do
+                echo "acl $HOST."$TLD"_https req_ssl_sni -i $ALIAS"
+            done
+        fi
+    done
+
+    echo
+
+    for i in $(ls $DOMAIN_DIR | cut -d / -f2); do
+        DOMAIN_NAME=$(jq -r .DOMAIN $i)
+        TLD="$(echo $DOMAIN_NAME | rev | cut -d '.' -f1 | rev)"
+        WILDCARD=$(echo $DOMAIN_NAME | grep '*')
+
+        if [[ "$DOMAIN_NAME" != "" && "$(jq -r .HTTPS_PORT $i)" != "" && "$DOMAIN_NAME" != "letsencrypt" ]]; then
+            if [ "$WILDCARD" != "" ]; then
+                HOST=$(echo $DOMAIN_NAME | rev | cut -d '.' -f2- | rev | cut -d '.' -f2-)
+                echo "use_backend $HOST."$TLD"_https if $HOST."$TLD"_https"
+            else
+                echo "use_backend "$DOMAIN_NAME"_https if "$DOMAIN_NAME"_https"
+            fi
+        fi
+    done
+
+    echo
+
+    for i in $(ls $DOMAIN_DIR | cut -d / -f2); do
+
+        if [[ "$DOMAIN_NAME" != "" && "$(jq -r .HTTPS_PORT $i)" != "" && "$DOMAIN_NAME" != "letsencrypt" ]]; then
+            DOMAIN_NAME=$(jq -r .DOMAIN $i)
+            TLD="$(echo $DOMAIN_NAME | rev | cut -d '.' -f1 | rev)"
+            WILDCARD=$(echo $DOMAIN_NAME | grep '*')
+            if [ "$WILDCARD" != "" ]; then
+                HOST=$(echo $DOMAIN_NAME | rev | cut -d '.' -f2- | rev | cut -d '.' -f2-)
+                echo "backend $HOST."$TLD"_https"
+                echo "	option ssl-hello-chk"
+                echo "	mode tcp"
+                echo "	server $HOST.$TLD $(jq -r .LOCAL_NAME $i):$(jq -r .HTTPS_PORT $i) check send-proxy"
+            else
+                echo "backend "$DOMAIN_NAME"_https"
+                echo "	option ssl-hello-chk"
+                echo "	mode tcp"
+                echo "	server $DOMAIN_NAME $(jq -r .LOCAL_NAME $i):$(jq -r .HTTPS_PORT $i) check send-proxy"
+            fi
+        fi
+    done
+
+} >>"$file"
+echo "$DOMAIN" >>$PROXY_CONFIG_DIR/new_config

scripts/nginx_config_create.sh

@@ -4,13 +4,13 @@ GENERATE_CERTIFICATE=$GENERATE_CERTIFICATE
 
 cd /proxy_config
 
-FILENAME=$1
+FILENAME="$1"
 
 DOMAIN_SOURCE=/domains/$FILENAME
 #DOMAIN_SOURCE=./domains/$FILENAME #TEMP
 DOMAIN_NAME=$(jq -r .DOMAIN $DOMAIN_SOURCE)
 HTTP_PORT=$(jq -r .HTTP_PORT $DOMAIN_SOURCE)
-HTTPS_PORT=$(jq -r .HTTPS_PORT $DOMAIN_SOURCE);
+HTTPS_PORT=$(jq -r .HTTPS_PORT $DOMAIN_SOURCE)
 ALIASES_HTTP=$(jq -r '.ALIASES_HTTP | select(.!="null") | join(" ")' $DOMAIN_SOURCE)
 ALIASES_HTTPS=$(jq -r '.ALIASES_HTTPS | select(.!="null") | join(" ")' $DOMAIN_SOURCE)
 REDIRECT_HTTP=$(jq -r .REDIRECT_HTTP $DOMAIN_SOURCE)
@@ -20,85 +20,91 @@ MAX_BODY_SIZE=$(jq -r .MAX_BODY_SIZE $DOMAIN_SOURCE)
 DEBUG=$(jq -r .DEBUG $DOMAIN_SOURCE)
 ALLOWED_NETWORK=$(jq -r '.ALLOWED_NETWORK | select(.!="null") | join(" ")' $DOMAIN_SOURCE)
 OPERATION=$(jq -r '.OPERATION' $DOMAIN_SOURCE)
+BASIC_AUTH=$(jq -r .BASIC_AUTH $DOMAIN_SOURCE)
 ALTERNATE_LOCATION_PATH=$(jq -r .ALTERNATE_LOCATION_PATH $DOMAIN_SOURCE)
-LOCAL_NAME=$(jq -r .LOCAL_NAME $DOMAIN_SOURCE 2>/dev/null);
+LOCAL_NAME=$(jq -r .LOCAL_NAME $DOMAIN_SOURCE 2>/dev/null)
 if [[ "$LOCAL_NAME" == "" || "$LOCAL_NAME" == "null" ]]; then
-        LOCAL_NAME=$(jq -r .LOCAL_IP $DOMAIN_SOURCE 2>/dev/null);
+    LOCAL_NAME=$(jq -r .LOCAL_IP $DOMAIN_SOURCE 2>/dev/null)
 fi
-RELOAD_LOCATIONS="";
+RELOAD_LOCATIONS=""
 
-if [ -n "$2" ]; then
-	echo "$DOMAIN_NAME DELETED";
-	rm $DOMAIN_NAME.conf;
-	exit;
+if [ -n "$2" ] || [ "$OPERATION" == "DELETE" ]; then
+    echo "$DOMAIN_NAME DELETED"
+    rm $DOMAIN_NAME.conf
+    exit
 fi
 
 add_alternate_location() {
-	{
-		cat $DOMAIN_NAME.conf | head -n -1
-		add_location;
-		echo "}"
+    {
+        cat $DOMAIN_NAME.conf | head -n -1
+        add_location
+        echo "}"
 
-	} >> "$file"
+    } >>"$file"
 }
 
 add_location() {
 
-		if [[ "$ALTERNATE_LOCATION_PATH" != "" ]]; then
+    if [[ "$ALTERNATE_LOCATION_PATH" != "" ]]; then
 
-			ALP_IDX=$(jq -r '.ALTERNATE_LOCATION_PATH | length' $DOMAIN_SOURCE)
-			ALP_IDX=$(( $ALP_IDX - 1 ))
+        ALP_IDX=$(jq -r '.ALTERNATE_LOCATION_PATH | length' $DOMAIN_SOURCE)
+        ALP_IDX=$(($ALP_IDX - 1))
 
-			for i in $(seq 0 $ALP_IDX) ;
-			do
-				ALP=$(jq -r .ALTERNATE_LOCATION_PATH[$i] $DOMAIN_SOURCE)
+        for i in $(seq 0 $ALP_IDX); do
+            ALP=$(jq -r .ALTERNATE_LOCATION_PATH[$i] $DOMAIN_SOURCE)
 
-				ALP_LOCAL_PATH=$(echo $ALP | jq -rc .LOCAL_PATH);
-				ALP_LOCAL_NAME=$(echo $ALP | jq -rc .LOCAL_NAME);
-				ALP_LOCAL_PORT=$(echo $ALP | jq -rc .LOCAL_PORT);
-				ALP_LOCAL_ALLOWED_NETWORK=$(echo $ALP | jq -rc '.LOCAL_ALLOWED_NETWORK | select(.!="null") | join(" ")');
+            ALP_LOCAL_PATH=$(echo $ALP | jq -rc .LOCAL_PATH)
+            ALP_LOCAL_NAME=$(echo $ALP | jq -rc .LOCAL_NAME)
+            ALP_LOCAL_PORT=$(echo $ALP | jq -rc .LOCAL_PORT)
+            ALP_LOCAL_ALLOWED_NETWORK=$(echo $ALP | jq -rc '.LOCAL_ALLOWED_NETWORK | select(.!="null") | join(" ")')
 
-				# do not duplicate locations
-				EXISTS=$(grep -rn "location $ALP_LOCAL_PATH {" -m 1 $DOMAIN_NAME.conf);
-				if [ -n "$EXISTS" ]; then
-					ROW_NUMBER=$(echo $EXISTS | cut -d ':' -f1);
-					START=$(($ROW_NUMBER + 2));
-					OFFSET=$(tail -n+$START $DOMAIN_NAME.conf | grep -n '}' -m 1 | cut -d ':' -f1);
-					OFFSET=$(($OFFSET - 2));
-					ALP_ALLOWED=$(echo $(tail -n+$START $DOMAIN_NAME.conf | head -n $OFFSET | awk '{print $2}')); # echo removes space at the end
-					if [ "$ALP_LOCAL_ALLOWED_NETWORK" != "$ALP_ALLOWED" ]; then
-						RELOAD_LOCATIONS=$RELOAD_LOCATIONS$ALP_LOCAL_PATH" "
-					fi;
-					# skip if exists
-					continue;
-				fi;
+            # do not duplicate locations
+            EXISTS=$(grep -rn "location $ALP_LOCAL_PATH {" -m 1 $DOMAIN_NAME.conf)
+            if [ -n "$EXISTS" ]; then
+                ROW_NUMBER=$(echo $EXISTS | cut -d ':' -f1)
+                START=$(($ROW_NUMBER + 2))
+                OFFSET=$(tail -n+$START $DOMAIN_NAME.conf | grep -n '}' -m 1 | cut -d ':' -f1)
+                OFFSET=$(($OFFSET - 2))
+                ALP_ALLOWED=$(echo $(tail -n+$START $DOMAIN_NAME.conf | head -n $OFFSET | awk '{print $2}')) # echo removes space at the end
+                if [ "$ALP_LOCAL_ALLOWED_NETWORK" != "$ALP_ALLOWED" ]; then
+                    RELOAD_LOCATIONS=$RELOAD_LOCATIONS$ALP_LOCAL_PATH" "
+                fi
+                # skip if exists
+                continue
+            fi
 
-				if [[ "$ALP_LOCAL_NAME" = "" ]]; then
-					ALP_LOCAL_NAME=$LOCAL_NAME
-				fi;
+            if [[ "$ALP_LOCAL_NAME" = "" ]]; then
+                ALP_LOCAL_NAME=$LOCAL_NAME
+            fi
 
-				if [[ "$ALP_LOCAL_PORT" = "" ]]; then
-					ALP_LOCAL_PORT=$HTTP_PORT
-				fi;
+            if [[ "$ALP_LOCAL_PORT" = "" ]]; then
+                ALP_LOCAL_PORT=$HTTP_PORT
+            fi
 
-				echo "location $ALP_LOCAL_PATH {"
+            echo "location $ALP_LOCAL_PATH {"
 
-				if [[ "$ALP_LOCAL_ALLOWED_NETWORK" != "" ]]; then
-					echo " limit_except GET HEAD {";
-					for i in $(echo $ALP_LOCAL_ALLOWED_NETWORK) ; do
-						echo " 	allow $i";
-					done;
-					echo " 	deny all;";
-					echo " }";
-				fi
+            if [ "$BASIC_AUTH" == "TRUE" ]; then
+                echo '  auth_basic           "SAFEBOX AUTHORIZATION";
+     auth_basic_user_file htpasswd;
+                        '
+            fi
 
-				if [[ "$ALP_LOCAL_PORT" != "" ]]; then
-					echo " proxy_pass http://$ALP_LOCAL_NAME:$ALP_LOCAL_PORT/;"
-				else
-					echo " proxy_pass http://$ALP_LOCAL_NAME:80;"
-				fi
- 
-				echo " proxy_set_header Host "'$http_host'";
+            if [[ "$ALP_LOCAL_ALLOWED_NETWORK" != "" ]]; then
+                echo " limit_except GET HEAD {"
+                for i in $(echo $ALP_LOCAL_ALLOWED_NETWORK); do
+                    echo " 	allow $i"
+                done
+                echo " 	deny all;"
+                echo " }"
+            fi
+
+            if [[ "$ALP_LOCAL_PORT" != "" ]]; then
+                echo " proxy_pass http://$ALP_LOCAL_NAME:$ALP_LOCAL_PORT/;"
+            else
+                echo " proxy_pass http://$ALP_LOCAL_NAME:80;"
+            fi
+
+            echo " proxy_set_header Host "'$http_host'";
  proxy_set_header X-Real-IP "'$remote_addr'";
  proxy_set_header X-Forwarded-For "'$proxy_add_x_forwarded_for'";
  proxy_set_header X-Forwarded-Proto "'$scheme'";
@@ -110,250 +116,231 @@ add_location() {
  proxy_read_timeout         300;
  proxy_next_upstream off;"
 
-				if [[ "$DEBUG" != "true" ]]; then
-					echo " access_log off;"
-				fi
-				echo " proxy_redirect off;"
-				echo " proxy_buffering off;"
-				echo "}"
-				echo "# location end"
-			done;
-		fi;
+            if [[ "$DEBUG" != "true" ]]; then
+                echo " access_log off;"
+            fi
+            echo " proxy_redirect off;"
+            echo " proxy_buffering off;"
+            echo "}"
+            echo "# location end"
+        done
+    fi
 
 }
 
 remove_alternate_location() {
 
-	if [[ "$ALTERNATE_LOCATION_PATH" != "" ]]; then
+    if [[ "$ALTERNATE_LOCATION_PATH" != "" ]]; then
 
-		ALP_IDX=$(jq -r '.ALTERNATE_LOCATION_PATH | length' $DOMAIN_SOURCE)
-		ALP_IDX=$(( $ALP_IDX - 1 ))
+        ALP_IDX=$(jq -r '.ALTERNATE_LOCATION_PATH | length' $DOMAIN_SOURCE)
+        ALP_IDX=$(($ALP_IDX - 1))
 
-		for i in $(seq 0 $ALP_IDX) ;
-		do
-			ALP=$(jq -r .ALTERNATE_LOCATION_PATH[$i] $DOMAIN_SOURCE)
-			ALP_LOCAL_PATH=$(echo $ALP | jq -rc .LOCAL_PATH);
-			remove_location $ALP_LOCAL_PATH
-		done;
-	fi;
+        for i in $(seq 0 $ALP_IDX); do
+            ALP=$(jq -r .ALTERNATE_LOCATION_PATH[$i] $DOMAIN_SOURCE)
+            ALP_LOCAL_PATH=$(echo $ALP | jq -rc .LOCAL_PATH)
+            remove_location $ALP_LOCAL_PATH
+        done
+    fi
 }
 
 remove_location() {
-	local LOCATION=$1
+    local LOCATION=$1
 
-	LOCATION_ROW="location $LOCATION {";
-	ROW_NUMBER=$(grep -rn "$LOCATION_ROW" $DOMAIN_NAME.conf | cut -d ':' -f1);
-	if [ -n "$ROW_NUMBER" ]; then
-		OFFSET=$(tail -n+$ROW_NUMBER $DOMAIN_NAME.conf | grep -n '# location end' -m 1 | cut -d ':' -f1);
-		START=$(($ROW_NUMBER - 1));
-		END=$(($ROW_NUMBER + $OFFSET));
+    LOCATION_ROW="location $LOCATION {"
+    ROW_NUMBER=$(grep -rn "$LOCATION_ROW" $DOMAIN_NAME.conf | cut -d ':' -f1)
+    if [ -n "$ROW_NUMBER" ]; then
+        OFFSET=$(tail -n+$ROW_NUMBER $DOMAIN_NAME.conf | grep -n '# location end' -m 1 | cut -d ':' -f1)
+        START=$(($ROW_NUMBER - 1))
+        END=$(($ROW_NUMBER + $OFFSET))
 
-		{
-			head -n$START $DOMAIN_NAME.conf
-			tail -n+$END $DOMAIN_NAME.conf
-		} >> $file
+        {
+            head -n$START $DOMAIN_NAME.conf
+            tail -n+$END $DOMAIN_NAME.conf
+        } >>$file
 
-		mv $file $DOMAIN_NAME.conf;
-	fi;
+        mv $file $DOMAIN_NAME.conf
+    fi
 }
 
-
-file="/tmp/$DOMAIN_NAME.conf"
-
-# check whether certificates exist or not
-
-
-echo "created domain name: "$DOMAIN_NAME;
-
-#cp -a /scripts/nginx_template.conf /tmp/$DOMAIN.conf
-
-# if domain already exists as a config file append alternate location there
-if [ -f $DOMAIN_NAME.conf ]; then
-
-	if [ "$OPERATION" = "DELETE" ]; then
-		remove_alternate_location;
-	elif [ "$OPERATION" = "MODIFY" ]; then
-		remove_alternate_location;
-		add_alternate_location;
-	else
-		# default CREATE, append location
-		add_alternate_location;
-
-		# reload alternate locations if allowed networks has changed
-		if [ -n "$RELOAD_LOCATIONS" ]; then
-			rm $file;
-			remove_alternate_location;
-			add_alternate_location;
-		fi;
-	fi;
-else
-
 # create new nginx config
-{
+create_new_config() {
+    {
 
-if [[ "$HTTP_PORT" != "80" ]]; then
-	echo "server {
+        REGENERATE="$1"
+
+        if [[ "$HTTP_PORT" != "80" ]]; then
+            echo "server {
 listen 80 proxy_protocol;"
-	if [[ "$ALIASES_HTTP" != "" ]]; then
-		echo "server_name $DOMAIN_NAME $ALIASES_HTTP;"
-	else
-		echo "server_name $DOMAIN_NAME;"
-	fi 
-echo "set_real_ip_from 0.0.0.0/0;
+            if [[ "$ALIASES_HTTP" != "" ]]; then
+                echo "server_name $DOMAIN_NAME $ALIASES_HTTP;"
+            else
+                echo "server_name $DOMAIN_NAME;"
+            fi
+            echo "set_real_ip_from 0.0.0.0/0;
 real_ip_header proxy_protocol;
 rewrite_log on;
 return 301 https://$DOMAIN_NAME;
 }"
 
-fi	
+        fi
 
-if [[ "$HTTP_PORT" != "" && "$HTTP_PORT" != "80" ]]; then
-	echo "server {
+        if [[ "$HTTP_PORT" != "" && "$HTTP_PORT" != "80" ]]; then
+            echo "server {
 	listen $HTTP_PORT proxy_protocol;
 	set_real_ip_from 0.0.0.0/0;
 	real_ip_header proxy_protocol;"
-	
-		if [[ "$ALIASES_HTTP" != "" ]]; then
-			echo "server_name $DOMAIN_NAME $ALIASES_HTTP;"
-		else
-			echo "server_name $DOMAIN_NAME;"
-		fi 
-		
-		if [[ "$MAX_BODY_SIZE" != "" ]]; then
-		echo "client_max_body_size "$MAX_BODY_SIZE";"
-		
-		else
-		
-		echo "client_max_body_size 0;"
-		fi 
-	
-	echo "rewrite_log on;"
-	
-	
-		if [[ "$REDIRECT_HTTP" != "" ]] ; then 
-			echo "return 301 $REDIRECT_HTTP;"
-		elif [[  "$HTTP_PORT" == "" ]]; then
-			echo "return 301 https://"$DOMAIN_NAME;
-	
-		else
-			echo "location / {"
-			
-			if [[ "$ALLOWED_NETWORK" != "" ]]; then
-				ALLOWED_NETWORK_IDX=$(jq -r '.ALLOWED_NETWORK | length' $DOMAIN_SOURCE)
-				ALLOWED_NETWORK_IDX=$(( $ALLOWED_NETWORK_IDX - 1 ))
-				
-				echo " limit_except GET HEAD {";
-				for i in $(seq 0 $ALLOWED_NETWORK_IDX) ; do
-					AN=$(jq -r .ALLOWED_NETWORK[$i] $DOMAIN_SOURCE)
-					echo " 	allow "$AN";"
-				done
-				echo " 	deny  all;"
-				echo " }";
-		 	fi
-	
-			if [[ "$HTTP_PORT" != "" ]]; then
-	 			echo " proxy_pass http://$LOCAL_NAME:$HTTP_PORT;"
-			fi
-	
-			echo " proxy_set_header Host "'$http_host'";
+
+            if [[ "$ALIASES_HTTP" != "" ]]; then
+                echo "server_name $DOMAIN_NAME $ALIASES_HTTP;"
+            else
+                echo "server_name $DOMAIN_NAME;"
+            fi
+
+            if [[ "$MAX_BODY_SIZE" != "" ]]; then
+                echo "client_max_body_size "$MAX_BODY_SIZE";"
+
+            else
+
+                echo "client_max_body_size 0;"
+            fi
+
+            echo "rewrite_log on;"
+
+            if [[ "$REDIRECT_HTTP" != "" ]]; then
+                echo "return 301 $REDIRECT_HTTP;"
+            elif [[ "$HTTP_PORT" == "" ]]; then
+                echo "return 301 https://"$DOMAIN_NAME
+
+            else
+                echo "location / {"
+
+                if [ "$BASIC_AUTH" == "TRUE" ]; then
+                    echo '  auth_basic           "SAFEBOX AUTHORIZATION";
+     auth_basic_user_file htpasswd;
+                        '
+                fi
+
+                if [[ "$ALLOWED_NETWORK" != "" ]]; then
+                    ALLOWED_NETWORK_IDX=$(jq -r '.ALLOWED_NETWORK | length' $DOMAIN_SOURCE)
+                    ALLOWED_NETWORK_IDX=$(($ALLOWED_NETWORK_IDX - 1))
+
+                    echo " limit_except GET HEAD {"
+                    for i in $(seq 0 $ALLOWED_NETWORK_IDX); do
+                        AN=$(jq -r .ALLOWED_NETWORK[$i] $DOMAIN_SOURCE)
+                        echo " 	allow "$AN";"
+                    done
+                    echo " 	deny  all;"
+                    echo " }"
+                fi
+
+                if [[ "$HTTP_PORT" != "" ]]; then
+                    echo " proxy_pass http://$LOCAL_NAME:$HTTP_PORT;"
+                fi
+
+                echo " proxy_set_header Host "'$http_host'";
 	 proxy_set_header X-Real-IP "'$remote_addr'";
 	 proxy_set_header X-Forwarded-For "'$proxy_add_x_forwarded_for'";
 	 proxy_set_header X-Forwarded-Proto "'$scheme'";
 	 proxy_set_header Upgrade "'$http_upgrade;'"
 	 proxy_cookie_path / /;
 	 proxy_set_header Connection "'$http_connection'" ;"
-	
-			if [[ "$DEBUG" != "true" ]]; then
-			 	echo " access_log off;"
-			fi
-			echo " proxy_redirect off;"
-			echo " proxy_buffering off;"
-			echo "}"
-				
-			if [[ "$ERROR_PAGE" != "" && "$HTTP_PORT" != "" ]]; then
-				echo "error_page 404 /$ERROR_PAGE;
+
+                if [[ "$DEBUG" != "true" ]]; then
+                    echo " access_log off;"
+                fi
+                echo " proxy_redirect off;"
+                echo " proxy_buffering off;"
+                echo "}"
+
+                if [[ "$ERROR_PAGE" != "" && "$HTTP_PORT" != "" ]]; then
+                    echo "error_page 404 /$ERROR_PAGE;
 				location = /$ERROR_PAGE {
 				      root    html;
 				      allow   all;
 				      index   404.html;
 				      rewrite ^ "'$scheme'" http://$ERROR_PAGE"'$request_uri'" permanent;
 					      }"
-			fi
-		fi
-	echo "}"
-fi
+                fi
+            fi
+            echo "}"
+        fi
 
-if [[ "$HTTPS_PORT" != "" ]]; then
-	echo "server {
+        if [[ "$HTTPS_PORT" != "" ]]; then
+            echo "server {
 listen 443 ssl proxy_protocol;
 set_real_ip_from 0.0.0.0/0;
 real_ip_header proxy_protocol;"
 
-if [[ "$ALIASES_HTTPS" != "" ]]; then
-	echo "server_name $DOMAIN_NAME $ALIASES_HTTPS;"
-else
-	echo "server_name $DOMAIN_NAME;"
-fi 
+            if [[ "$ALIASES_HTTPS" != "" ]]; then
+                echo "server_name $DOMAIN_NAME $ALIASES_HTTPS;"
+            else
+                echo "server_name $DOMAIN_NAME;"
+            fi
 
-if [[ "$MAX_BODY_SIZE" != "" ]]; then
-	echo "client_max_body_size "$MAX_BODY_SIZE";"
-else
-	echo "client_max_body_size 0;"
-fi 
+            if [[ "$MAX_BODY_SIZE" != "" ]]; then
+                echo "client_max_body_size "$MAX_BODY_SIZE";"
+            else
+                echo "client_max_body_size 0;"
+            fi
 
-echo "rewrite_log on;
+            echo "rewrite_log on;
 proxy_ssl_server_name on; 
  ssl_dhparam /etc/ssl/keys/$DOMAIN_NAME/dhparam.pem;"
 
-if [ "$GENERATE_CERTIFICATE" == "true" ]; then 
+            if [ "$GENERATE_CERTIFICATE" == "true" ]; then
 
-echo "ssl_certificate /etc/ssl/keys/$DOMAIN_NAME/fullchain.pem;
+                echo "ssl_certificate /etc/ssl/keys/$DOMAIN_NAME/fullchain.pem;
  ssl_certificate_key /etc/ssl/keys/$DOMAIN_NAME/key.pem;"
 
-else 
-	echo "ssl_certificate /etc/ssl/keys/fullchain.pem;
+            else
+                echo "ssl_certificate /etc/ssl/keys/fullchain.pem;
  ssl_certificate_key /etc/ssl/keys/key.pem;"
 
-fi
+            fi
 
-echo "ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+            echo "ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
  ssl_prefer_server_ciphers on;
  ssl_ciphers "'"EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRSA RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS !RC4 !kDHE"'";
 ssl_session_cache shared:SSL:50m;
 ssl_session_timeout 5m;
 ssl_stapling on;"
 
-
-	if [[ "$ERROR_PAGE" != "" && "$HTTPS_PORT" != "" ]]; then
-		echo "error_page 404 /$ERROR_PAGE;
+            if [[ "$ERROR_PAGE" != "" && "$HTTPS_PORT" != "" ]]; then
+                echo "error_page 404 /$ERROR_PAGE;
 location = /$ERROR_PAGE {
       root    html;
       allow   all;
       index   404.html;
       rewrite ^ "'$scheme' "http://$ERROR_PAGE"'$request_uri'" permanent;
 	      }"
-	fi
+            fi
 
-	if [[ "$REDIRECT_HTTPS" != ""  ]]; then
-		echo "return 301 $REDIRECT_HTTPS;"
-	else 
-		echo "location / {"
+            if [[ "$REDIRECT_HTTPS" != "" ]]; then
+                echo "return 301 $REDIRECT_HTTPS;"
+            else
+                echo "location / {"
 
-		if [[ "$ALLOWED_NETWORK" != "" ]]; then
-			ALLOWED_NETWORK_IDX=$(jq -r '.ALLOWED_NETWORK | length' $DOMAIN_SOURCE)
-			ALLOWED_NETWORK_IDX=$(( $ALLOWED_NETWORK_IDX - 1 ))
-			
-			echo " limit_except GET HEAD {";
-			for i in $(seq 0 $ALLOWED_NETWORK_IDX) ; do
-					AN=$(jq -r .ALLOWED_NETWORK[$i] $DOMAIN_SOURCE)
-					echo " 	allow "$AN";"
-			done
-			echo " 	deny  all;"
-			echo " }";
-	 	fi	
-echo " proxy_pass http://$LOCAL_NAME:$HTTPS_PORT;"
- 
-		echo " proxy_set_header Host "'$http_host'";
+                if [ "$BASIC_AUTH" == "TRUE" ]; then
+                    echo '  auth_basic           "SAFEBOX AUTHORIZATION";
+     auth_basic_user_file htpasswd;
+                        '
+                fi
+
+                if [[ "$ALLOWED_NETWORK" != "" ]]; then
+                    ALLOWED_NETWORK_IDX=$(jq -r '.ALLOWED_NETWORK | length' $DOMAIN_SOURCE)
+                    ALLOWED_NETWORK_IDX=$(($ALLOWED_NETWORK_IDX - 1))
+
+                    echo " limit_except GET HEAD {"
+                    for i in $(seq 0 $ALLOWED_NETWORK_IDX); do
+                        AN=$(jq -r .ALLOWED_NETWORK[$i] $DOMAIN_SOURCE)
+                        echo " 	allow "$AN";"
+                    done
+                    echo " 	deny  all;"
+                    echo " }"
+                fi
+                echo " proxy_pass http://$LOCAL_NAME:$HTTPS_PORT;"
+
+                echo " proxy_set_header Host "'$http_host'";
  proxy_set_header X-Real-IP "'$remote_addr'";
  proxy_set_header X-Forwarded-For "'$proxy_add_x_forwarded_for'";
  proxy_set_header X-Forwarded-Proto "'$scheme'";
@@ -365,30 +352,89 @@ echo " proxy_pass http://$LOCAL_NAME:$HTTPS_PORT;"
  proxy_read_timeout         300;
  proxy_next_upstream off;"
 
-		if [[ "$DEBUG" != "true" ]]; then
-		 	echo " access_log off;"
-		fi
-		echo " proxy_redirect off;"
-		echo " proxy_buffering off;"
-		echo "}"
+                if [[ "$DEBUG" != "true" ]]; then
+                    echo " access_log off;"
+                fi
+                echo " proxy_redirect off;"
+                echo " proxy_buffering off;"
+                echo "}"
 
-		add_location;
+                echo "# first location end"
 
-	fi
+                add_location
 
-echo "}"
+            fi
 
-fi
+            if [ "$REGENERATE" == "" ]; then
+                echo "}"
+            fi
 
-} >> "$file"
+        fi
 
-fi; # end of create new nginx config
+    } >>"$file"
+}
+
+regenerate_config() {
+
+    mv $file $DOMAIN_NAME.conf
+
+    # regenerates nginx config into $file
+    create_new_config "regenerate"
+
+    #  append existing alternate locations to new config file
+    OFFSET=$(cat $DOMAIN_NAME.conf | grep -n '# first location end' -m 1 | cut -d ':' -f1)
+    OFFSET=$(($OFFSET + 1))
+    {
+        tail -n+$OFFSET $DOMAIN_NAME.conf
+    } >>$file
+}
+
+file="/tmp/$DOMAIN_NAME.conf"
+
+# check whether certificates exist or not
+
+echo "created domain name: "$DOMAIN_NAME
+
+#cp -a /scripts/nginx_template.conf /tmp/$DOMAIN.conf
+
+# if domain already exists as a config file append alternate location there
+if [ -f $DOMAIN_NAME.conf ]; then
+
+    if [ "$OPERATION" = "DELETE" ]; then
+        remove_alternate_location
+    elif [ "$OPERATION" = "MODIFY" ]; then
+        # must be before create_new_config
+        remove_alternate_location
+        add_alternate_location
+
+        regenerate_config
+
+    else
+        # default CREATE, append location
+        add_alternate_location
+
+        regenerate_config
+
+        # reload alternate locations if allowed networks has changed
+        if [ -n "$RELOAD_LOCATIONS" ]; then
+            rm $file
+            remove_alternate_location
+            add_alternate_location
+        fi
+    fi
+else
+
+    # rewrite operation if nginx config file doesn't exists
+    OPERATION="CREATE"
+    create_new_config
+
+fi # end of create new nginx config
 
 if [ "$OPERATION" != "DELETE" ]; then
-	mv $file $DOMAIN_NAME.conf;
-fi;
-echo "$DOMAIN" >> new_config
+    mv $file $DOMAIN_NAME.conf
+fi
+echo "$DOMAIN" >>new_config
 
 if [ "$HTTPS_PORT" != "" ]; then
-	/scripts/check_certificates.sh "$DOMAIN_NAME";
+    /scripts/check_certificates.sh "$DOMAIN_NAME" &
 fi

scripts/scheduler.sh

@@ -17,7 +17,7 @@ mkdir -p $CERT_DIR
 
 unset IFS
 
-inotifywait --exclude .sw -m -e CREATE,CLOSE_WRITE,DELETE,MOVED_TO -r $DOMAIN_DIR $CERT_DIR $PROXY_CONFIG_DIR | \
+inotifywait --exclude "\.(swp|tmp)" -m -e CREATE,CLOSE_WRITE,DELETE,MOVED_TO -r $DOMAIN_DIR $CERT_DIR $PROXY_CONFIG_DIR | \
 while read dir op file
 
 do