Added letsencrypt additional values

scripts/check_certificates.sh

@@ -29,15 +29,42 @@ if [ "$SERVICE_FILES" == "" ]; then
 	SERVICE_FILES=/etc/user/config/services
 fi
 
+if [ "$SOURCE" == "" ]; then
+	SOURCE=/etc/user/config
+fi
+
+if [[ -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then
+    SETUP="/setup";
+else
+    SETUP="setup";
+    DOCKER_REGISTRY_URL="";
+fi
+
+    DNS_DIR="/etc/system/data/dns";
+    DNS="--env DNS_DIR=$DNS_DIR";
+    DNS_PATH="--volume $DNS_DIR:/etc/dns:rw";
+
+    CA_PATH=/etc/ssl/certs;
+    CA="--env CA_PATH=$CA_PATH";
+    CA_FILE="--volume $CA_PATH:$CA_PATH:ro";
+
+
 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"
+$DNS $DNS_PATH \
+$CA $CA_FILE \
+-w /services/ \
+-v $SOURCE/system.json:/etc/user/config/system.json:ro \
+-v $SOURCE/user.json:/etc/user/config/user.json:ro \
+-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 DOMAIN=$DOMAIN \
+--env TIMEOUT=$TIMEOUT \
+--env RESTART=$RESTART \
+--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
+$DOCKER_REGISTRY_URL$SETUP"
+
 
 letsencrypt_certificates() {
 
@@ -76,27 +103,6 @@ create_self_signed_certificate() {
 		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;
 	
-		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
-			UP=$(docker ps | grep $CONTAINER | grep Up | wc -l)
-			PROXY_NAMES=$PROXY_NAMES" "$CONTAINER;
-			RUNNING_CONTAINERS=$((RUNNING_CONTAINERS + UP))
-		done;
-	
-		# In case of no running proxies found, try to start the service
-		
-		for NAME in $(echo $PROXY_NAMES); do
-			echo "Starting $NAME";
-			docker start $NAME;
-			docker ps |grep $NAME;
-		done;
-		
-		for NAME in $(echo $RUNNING_CONTAINERS); do
-			echo "Restarting $NAME";
-			docker restart $NAME;
-			docker ps |grep $NAME;
-		done;
 
 	fi
 
@@ -111,7 +117,24 @@ if [ ! -f "$DOMAIN_CERT_DIR/dhparam.pem" ]; then
 	# generate dhparam file
 	openssl dhparam -dsaparam -out $DOMAIN_CERT_DIR/dhparam.pem 4096;
 	create_self_signed_certificate;
+		
+	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;
 
+	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