gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-20 23:36:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

adding fixes

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
compose/docker-compose.yml
View file

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

12
scripts/nm-quick-interactive.sh
View file

@ -257,10 +257,13 @@ if [ "$INSTALL_TYPE" = "ee" ]; then
fi fi
unset EMAIL unset GET_EMAIL
while [ -z ${EMAIL} ]; do unset RAND_EMAIL
read -p "Email Address (for LetsEncrypt): " EMAIL RAND_EMAIL="$(echo $RANDOM | md5sum | head -c 16)@email.com"
done 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 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/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/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/REPLACE_MASTER_KEY/$MASTER_KEY/g" /root/docker-compose.yml
sed -i "s/YOUR_EMAIL/$EMAIL/g" /root/Caddyfile sed -i "s/YOUR_EMAIL/$EMAIL/g" /root/Caddyfile
sed -i "s/REPLACE_MQ_ADMIN_PASSWORD/$MQ_PASSWORD/g" /root/docker-compose.yml sed -i "s/REPLACE_MQ_ADMIN_PASSWORD/$MQ_PASSWORD/g" /root/docker-compose.yml