diff --git a/docker-compose.yml b/docker-compose.yml index 58b0ab2..33690a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,7 +55,8 @@ x-explorer-service: &explorer-service - ${EXPLORER_PORT} labels: - "traefik.enable=true" - - "traefik.http.routers.explorer.rule=(Host(`${DOMAIN}`) && PathPrefix(`/explorer`) )" + - "traefik.http.routers.explorer.rule=(PathPrefix(`/explorer`) )" #!nole + # - "traefik.http.routers.explorer.rule=(Host(`${DOMAIN}`) && PathPrefix(`/explorer`) )" #!le - "traefik.http.routers.explorer.entrypoints=websecure" - "traefik.http.routers.explorer.tls" - "traefik.http.routers.explorer.service=explorer" @@ -95,7 +96,8 @@ services: - "monerod-data:/home/monero/.bitmonero" labels: - "traefik.enable=true" - - "traefik.http.routers.monerod.rule=(Host(`${DOMAIN}`))" + # - "traefik.http.routers.monerod.rule=(Host(`${DOMAIN}`) && PathPrefix(`/`))" #!le + - "traefik.http.routers.monerod.rule=(PathPrefix(`/`))" #!nole - "traefik.http.routers.monerod.entrypoints=websecure" - "traefik.http.routers.monerod.tls" - "traefik.http.routers.monerod.service=monerod" diff --git a/installer.sh b/installer.sh index 7b6e4ec..17ac950 100755 --- a/installer.sh +++ b/installer.sh @@ -200,7 +200,7 @@ configure_tls_domain() { read -r -p " Enter again your desired domain []: " TLS_DOMAIN done echo -e "${OkBullet}Enter the desired email for the Let's Encrypt SSL certificate." - read -r -e -p " Enter a valid email. Let's Encrypt validates it! []: " TLS_DOMAIN + read -r -e -p " Enter a valid email. Let's Encrypt validates it! []: " TLS_EMAIL while ! echo "${TLS_EMAIL}" | grep -qP '^[A-Za-z0-9+._-]+@([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,6}$'; do echo -e "${WarnBullet}Email not valid." read -r -p " Enter again your desired email []: " TLS_EMAIL @@ -210,6 +210,7 @@ configure_tls_domain() { sed -i "s/TRAEFIK_ACME_EMAIL=.*/TRAEFIK_ACME_EMAIL=${TLS_EMAIL}/g" .env # Enable LE settings in compose sed -i '/#!le/s/# //g' docker-compose.yml + sed -i '/#!nole/s/- /# - /g' docker-compose.yml sed -i "/#\!traefik-command/s/\*traefik-command-nole/\*traefik-command-le/g" docker-compose.yml fi } @@ -292,8 +293,7 @@ start_xmrsh() { check_return $? docker-compose up -d >>"${XMRSH_LOG_FILE}" 2>&1 check_return $? - - if ENABLE_TOR = true; then + if [ $ENABLE_TOR = true ]; then sleep 3 ONION=$(docker logs tor 2>&1 | grep Entrypoint | cut -d " " -f 8) fi