adding fixes

This commit is contained in:
afeiszli 2022-11-28 13:03:07 -05:00
parent 45db480522
commit a7af7ff6eb
2 changed files with 11 additions and 5 deletions

View file

@ -56,11 +56,13 @@ services:
image: caddy:2.6.2
container_name: caddy
restart: unless-stopped
network_mode: host
volumes:
- /root/Caddyfile:/etc/caddy/Caddyfile
- caddy_data:/data
- caddy_conf:/config
ports:
- "80:80"
- "443:443"
coredns:
container_name: coredns
image: coredns/coredns

View file

@ -257,10 +257,13 @@ if [ "$INSTALL_TYPE" = "ee" ]; then
fi
unset EMAIL
while [ -z ${EMAIL} ]; do
read -p "Email Address (for LetsEncrypt): " EMAIL
done
unset GET_EMAIL
unset RAND_EMAIL
RAND_EMAIL="$(echo $RANDOM | md5sum | head -c 16)@email.com"
read -p "Email Address for Domain Registration (click 'enter' to use $RAND_EMAIL): " GET_EMAIL
if [ -n "$GET_EMAIL" ]; then
EMAIL=$RAND_EMAIL
fi
wait_seconds 2
@ -302,6 +305,7 @@ echo "Setting docker-compose and Caddyfile..."
sed -i "s/SERVER_PUBLIC_IP/$SERVER_PUBLIC_IP/g" /root/docker-compose.yml
sed -i "s/NETMAKER_BASE_DOMAIN/$NETMAKER_BASE_DOMAIN/g" /root/Caddyfile
sed -i "s/NETMAKER_BASE_DOMAIN/$NETMAKER_BASE_DOMAIN/g" /root/docker-compose.yml
sed -i "s/REPLACE_MASTER_KEY/$MASTER_KEY/g" /root/docker-compose.yml
sed -i "s/YOUR_EMAIL/$EMAIL/g" /root/Caddyfile
sed -i "s/REPLACE_MQ_ADMIN_PASSWORD/$MQ_PASSWORD/g" /root/docker-compose.yml