gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-01 00:49:04 +08:00
Code Issues Projects Releases Packages Wiki Activity

use wait script to encrypt mq password

Browse source
This commit is contained in:
Abhishek Kondur 2023-02-07 17:01:57 +04:00
parent aa3820d2bf
commit f19e3c31d0
3 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
compose/docker-compose.yml
View file

@ -70,11 +70,13 @@ services:
depends_on: depends_on:
- netmaker - netmaker
restart: unless-stopped restart: unless-stopped
command: ["/mosquitto/config/wait.sh"]
environment: environment:
NETMAKER_SERVER_HOST: "https://api.NETMAKER_BASE_DOMAIN" MQ_PASSWORD: "REPLACE_MQ_PASSWORD"
MQ_USERNAME: "REPLACE_MQ_USERNAME"
volumes: volumes:
- /root/mosquitto.conf:/mosquitto/config/mosquitto.conf - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf
- /root/password.txt:/mosquitto/password.txt - /root/wait.sh:/mosquitto/config/wait.sh
- mosquitto_logs:/mosquitto/log - mosquitto_logs:/mosquitto/log
volumes: volumes:
caddy_data: {} caddy_data: {}

15
docker/wait.sh
View file

@ -1,18 +1,13 @@
#!/bin/ash #!/bin/ash
wait_for_netmaker() { encrypt_password() {
echo "SERVER: ${NETMAKER_SERVER_HOST}" echo "${MQ_USERNAME}:${MQ_PASSWORD}" > /mosquitto/passwords.txt
until curl --output /dev/null --silent --fail --head \ mosquitto_passwd -U /mosquitto/passwords.txt
--location "${NETMAKER_SERVER_HOST}/api/server/health"; do
echo "Waiting for netmaker server to startup"
sleep 1
done
} }
main(){ main(){
# wait for netmaker to startup
apk add curl encrypt_password
wait_for_netmaker
echo "Starting MQ..." echo "Starting MQ..."
# Run the main container command. # Run the main container command.
/docker-entrypoint.sh /docker-entrypoint.sh

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

@ -191,8 +191,6 @@ MASTER_KEY=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 30 ; echo '')
MQ_USERNAME="netmaker" MQ_USERNAME="netmaker"
MQ_PASSWORD=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 30 ; echo '') MQ_PASSWORD=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 30 ; echo '')
DOMAIN_TYPE="" DOMAIN_TYPE=""
echo "${MQ_USERNAME}:${MQ_PASSWORD}" > /root/password.txt
mosquitto_passwd -U /root/password.txt
echo "-----------------------------------------------------" echo "-----------------------------------------------------"
echo "Would you like to use your own domain for netmaker, or an auto-generated domain?" echo "Would you like to use your own domain for netmaker, or an auto-generated domain?"
echo "To use your own domain, add a Wildcard DNS record (e.x: *.netmaker.example.com) pointing to $SERVER_PUBLIC_IP" echo "To use your own domain, add a Wildcard DNS record (e.x: *.netmaker.example.com) pointing to $SERVER_PUBLIC_IP"
@ -304,7 +302,8 @@ if [ "$INSTALL_TYPE" = "ee" ]; then
fi fi
wget -O /root/docker-compose.yml $COMPOSE_URL && wget -O /root/mosquitto.conf https://raw.githubusercontent.com/gravitl/netmaker/master/docker/mosquitto.conf && wget -O /root/Caddyfile $CADDY_URL wget -O /root/docker-compose.yml $COMPOSE_URL && wget -O /root/mosquitto.conf https://raw.githubusercontent.com/gravitl/netmaker/master/docker/mosquitto.conf && wget -O /root/Caddyfile $CADDY_URL
wget -q -O /root/wait.sh https://raw.githubusercontent.com/gravitl/netmaker/master/docker/wait.sh
chmod +x /root/wait.sh
mkdir -p /etc/netmaker mkdir -p /etc/netmaker
echo "Setting docker-compose and Caddyfile..." echo "Setting docker-compose and Caddyfile..."