Selaa lähdekoodia

Fixed nm-certs relative path (#2311)

* nm-certs permission (#2308)

* nm-certs permission

* single quotes error

* fixed relative path

---------

Co-authored-by: Christopher Blaha <[email protected]>
Tobias Cudnik 2 vuotta sitten
vanhempi
commit
065c9c328a
2 muutettua tiedostoa jossa 4 lisäystä ja 3 poistoa
  1. 2 2
      scripts/nm-certs.sh
  2. 2 1
      scripts/nm-quick.sh

+ 2 - 2
scripts/nm-certs.sh

@@ -54,7 +54,8 @@ chmod +x zerossl-bot.sh
 # request the certs
 ./zerossl-bot.sh "$CERTBOT_PARAMS"
 EOF
-chmod +x certbot-entry.sh
+
+chmod +x "$SCRIPT_DIR/certbot-entry.sh"
 
 # request certs
 sudo docker run -it --rm --name certbot \
@@ -73,7 +74,6 @@ if [ ! -f "$CERT_DIR"/fullchain.pem ]; then
 	sudo docker run -it --rm --name certbot \
 		-p 80:80 -p 443:443 \
 		-v "$SCRIPT_DIR/letsencrypt:/etc/letsencrypt" \
-		--entrypoint "/opt/certbot/certbot-entry.sh" \
 		certbot/certbot "$CERTBOT_PARAMS"
 	if [ ! -f "$CERT_DIR"/fullchain.pem ]; then
 		echo "Missing file: $CERT_DIR/fullchain.pem"

+ 2 - 1
scripts/nm-quick.sh

@@ -331,7 +331,7 @@ save_config_item() { (
 	# echo "VALUE $VALUE"
 	if grep -q "^$NAME=" "$CONFIG_PATH"; then
 		# TODO escape | in the value
-		sed -i "s|$NAME=.*|$NAME='$VALUE'|" "$CONFIG_PATH"
+		sed -i "s|$NAME=.*|$NAME=$VALUE|" "$CONFIG_PATH"
 	else
 		echo "$NAME=\"$VALUE\"" >>"$CONFIG_PATH"
 	fi
@@ -747,6 +747,7 @@ install_netmaker() {
 	save_config
 
 	# Fetch / update certs using certbot
+	chmod +x "$SCRIPT_DIR"/nm-certs.sh
 	"$SCRIPT_DIR"/nm-certs.sh
 
 	echo "Starting containers..."