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

Minor bugfixes.

Browse Source
This commit is contained in:
Gyorgy Berenyi
2021-09-02 11:50:20 +00:00
parent 0bb748f2d9
commit 6388f36687
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
scripts/check_certificates.sh
View File

@@ -14,14 +14,26 @@ service_exec="docker run --rm \
-v /usr/bin/docker:/usr/bin/docker:ro registry.format.hu/setup /scripts/service-exec" -v /usr/bin/docker:/usr/bin/docker:ro registry.format.hu/setup /scripts/service-exec"
letsencrypt_certificates() { letsencrypt_certificates() {
$service_exec /services/letsencrypt.json start
echo "XYZ: "$PROXY_SERVICE_FILE" "$ROLE
# 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;
# 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";
create_self_signed_certificate;
fi;
$service_exec /services/letsencrypt.json start
} }
create_self_signed_certificate() { create_self_signed_certificate() {
# generate dhparam file
openssl dhparam -dsaparam -out $DOMAIN_CERT_DIR/dhparam.pem 4096;
# generate key # generate key
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;
@@ -31,11 +43,17 @@ cp -a $DOMAIN_CERT_DIR/cert.pem $DOMAIN_CERT_DIR/fullchain.pem;
if [ ! -d "$DOMAIN_CERT_DIR" ]; then if [ ! -d "$DOMAIN_CERT_DIR" ]; then
echo "$DOMAIN not contains certificates, creates new." echo "$DOMAIN not contains certificates, creates new."
mkdir -p $DOMAIN_CERT_DIR; mkdir -p $DOMAIN_CERT_DIR;
CURL_CHECK="curl -s -o /dev/null -w "%{http_code}" https://$LETSENCRYPT_URL"; fi
if [[ "$(eval $CURL_CHECK)" != "200" ]] ; then if [ ! -f "$DOMAIN_CERT_DIR/dhparam.pem" ]; then
# generate dhparam file
openssl dhparam -dsaparam -out $DOMAIN_CERT_DIR/dhparam.pem 4096;
fi
CURL_CHECK="curl -s -o /dev/null -w "%{http_code}" https://$LETSENCRYPT_URL";
if [[ "$(eval $CURL_CHECK)" != "200" ]] ; then
create_self_signed_certificate; create_self_signed_certificate;
fi
else else
file="$DOMAIN_CERT_DIR/letsencrypt" file="$DOMAIN_CERT_DIR/letsencrypt"
{ {
@@ -44,3 +62,4 @@ else
letsencrypt_certificates; letsencrypt_certificates;
fi fi

1
scripts/nginx_config_create.sh
View File

@@ -27,7 +27,6 @@ if [[ $HTTPS_PORT != "" ]]; then
/scripts/check_certificates.sh "$DOMAIN"; /scripts/check_certificates.sh "$DOMAIN";
fi fi
echo "3";
echo "created domain name: "$DOMAIN; echo "created domain name: "$DOMAIN;
file="/tmp/$DOMAIN.conf" file="/tmp/$DOMAIN.conf"