adding debug volume and log conent

proxy-scheduler.json

@@ -6,11 +6,16 @@
     "containers": [
         {
             "IMAGE": "safebox/proxy-scheduler:latest",
-            "NAME": "proxy_scheduler-ifhiwhhg",
+            "NAME": "proxy_scheduler",
             "MEMORY": "64M",
             "IP": "null",
             "NETWORK": "host",
             "VOLUMES": [
+                {
+                    "SOURCE": "SHARED",
+                    "DEST": "/var/tmp/shared",
+                    "TYPE": "rw"
+                },
                 {
                     "SOURCE": "/etc/user/config/services",
                     "DEST": "/etc/user/config/services",

scripts/check_certificates.sh

@@ -14,7 +14,21 @@
 TIMEOUT=$TIMEOUT
 RESTART=$RESTART
 
-SETUP_VERSION=${SETUP_VERSION:-latest};
+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")
+
+create_json() {
+    LOG=$(cat $LOG_FILE | base64 -w0)
+    TMP_FILE=$(mktemp)
+    install -m 664 -g 65534 /dev/null $TMP_FILE
+    jq 'if . == null or . == [] then [{"domain": "'$DOMAIN'", "date": "'$DATE'", "status": "'$STATUS'", "log": "'$LOG'"}] else . + [{"domain": "'$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
@@ -27,10 +41,10 @@ fi
 
 # Setup docker registry url path
 if [[ -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]]; then
-    SETUP="/setup";
+    SETUP="/setup"
 else
-    SETUP="setup";
+    SETUP="setup"
-    DOCKER_REGISTRY_URL="";
+    DOCKER_REGISTRY_URL=""
 fi
 
 if [ "$SETUP_VERSION" == "latest" ]; then
@@ -40,7 +54,7 @@ if [ "$SETUP_VERSION" == "latest" ]; then
 --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 \
@@ -50,7 +64,7 @@ else
  -v /etc/user/config/services/:/services/:ro \
  -v /etc/user/config/services/tmp:/services/tmp:rw \
 "
-fi;
+fi
 
 service_exec="docker run --rm \
 -w /services/ \
@@ -66,35 +80,36 @@ letsencrypt_certificates() {
     for retries in $(seq 0 $((RESTART + 1))); do
         if [[ $retries -le $RESTART ]]; then
 
-                        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
-                                echo "Starting letsencrypt process";                           
+                echo "Starting letsencrypt process"
                 mkdir -p $SERVICE_FILES/tmp/tmp
-                                cp -av /firewall-files/firewall-letsencrypt.json $SERVICE_FILES/tmp/;
+                cp -av /firewall-files/firewall-letsencrypt.json $SERVICE_FILES/tmp/
-                                LETSENCRYPT_TEMP_SERVICE_FILE=$(mktemp -p $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;
+                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 ; 
+                $service_exec $(basename $LETSENCRYPT_TEMP_SERVICE_FILE) start info prechecked
-				break;
+                rm -v $SERVICE_FILES/tmp/firewall-letsencrypt.json
+                break
             else
-				echo "Waiting "$TIMEOUT" second for previous letsencrypt process ending";
+                echo "Waiting "$TIMEOUT" second for previous letsencrypt process ending"
-				sleep $TIMEOUT;
+                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";
+            echo "Reached retrying limit: "$RESTART" ,giving up to start lets encrypt process, try self sign the certificate"
         fi
 
     done
@@ -108,10 +123,9 @@ create_self_signed_certificate() {
     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";
+        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";
+        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;
+        cp -a $DOMAIN_CERT_DIR/cert.pem $DOMAIN_CERT_DIR/fullchain.pem
-	
 
     fi
 
@@ -119,66 +133,72 @@ create_self_signed_certificate() {
 
 if [ ! -d "$DOMAIN_CERT_DIR" ]; then
     echo "$DOMAIN not contains certificates, creates new."
-	mkdir -p $DOMAIN_CERT_DIR;
+    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;
+    openssl dhparam -dsaparam -out $DOMAIN_CERT_DIR/dhparam.pem 4096
-	create_self_signed_certificate;
+    create_self_signed_certificate
 
-	PROXY_NAMES="";
+    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;
+        PROXY_NAMES=$PROXY_NAMES" "$CONTAINER
-	done;
+    done
 
     for NAME in $(echo $PROXY_NAMES); do
-		RUNNING_CONTAINER=$(docker ps | grep $NAME | grep Up);
+        RUNNING_CONTAINER=$(docker ps | grep $NAME | grep Up)
         if [ "$RUNNING_CONTAINER" != "" ]; then
-			echo "Restarting $NAME";
+            echo "Restarting $NAME"
-			docker restart $NAME;
+            docker restart $NAME
         else
-			echo "Starting $NAME";
+            echo "Starting $NAME"
-			docker start $NAME;
+            docker start $NAME
-		fi;
+        fi
-		docker ps |grep $NAME;
+        docker ps | grep $NAME
-	done;
+    done
 
 fi
 
 if [ "$GENERATE_CERTIFICATE" == "true" ]; then
 
-	CURL_CHECK="curl -s -o /dev/null -w "%{http_code}" https://$LETSENCRYPT_URL";
+    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";
+        } >>"$file"
 
-		DOMAIN_CHECK="curl -s -o /dev/null -w "%{http_code}" http://$DOMAIN";
+        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
-			letsencrypt_certificates;
+            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;
+                    sleep $TIMEOUT
-					echo "Starting letsencrypt process again";
+                    echo "Starting letsencrypt process again"
                     if [[ "$(eval $DOMAIN_CHECK)" == "200" || "$(eval $DOMAIN_CHECK)" == "301" ]]; then
-						letsencrypt_certificates;
+                        letsencrypt_certificates
                         echo "Started letsencrypt for domain: $DOMAIN second time"
-						break;
+                        break
                     else
-						echo "Waiting "$TIMEOUT" second for starting proxies";
+                        echo "Waiting "$TIMEOUT" second for starting proxies"
-						sleep $TIMEOUT;
+                        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";
+                    LOG="The domain '$DOMAIN' could not reachable. Reached retrying limit: '$RESTART', giving up to start lets encrypt process, try self sign the certificate"
+                    STATUS="failed"
+                    create_json $DOMAIN $STATUS $LOG
                 fi
 
             done