Git-Mirrors/xmr.sh
1
0
Fork 0
mirror of https://github.com/lalanza808/xmr.sh.git synced 2025-05-12 16:32:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix path prefixes

Browse source
This commit is contained in:
vdo 2022-05-27 12:26:20 +01:00
parent 2000149579
commit 7e0523abd1
No known key found for this signature in database
GPG key ID: F10AD1E5C08EA7E2
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docker-compose.yml
View file

@ -55,7 +55,8 @@ x-explorer-service: &explorer-service
- ${EXPLORER_PORT} - ${EXPLORER_PORT}
labels: labels:
- "traefik.enable=true" - "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.entrypoints=websecure"
- "traefik.http.routers.explorer.tls" - "traefik.http.routers.explorer.tls"
- "traefik.http.routers.explorer.service=explorer" - "traefik.http.routers.explorer.service=explorer"
@ -95,7 +96,8 @@ services:
- "monerod-data:/home/monero/.bitmonero" - "monerod-data:/home/monero/.bitmonero"
labels: labels:
- "traefik.enable=true" - "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.entrypoints=websecure"
- "traefik.http.routers.monerod.tls" - "traefik.http.routers.monerod.tls"
- "traefik.http.routers.monerod.service=monerod" - "traefik.http.routers.monerod.service=monerod"

6
installer.sh
View file

@ -200,7 +200,7 @@ configure_tls_domain() {
read -r -p " Enter again your desired domain []: " TLS_DOMAIN read -r -p " Enter again your desired domain []: " TLS_DOMAIN
done done
echo -e "${OkBullet}Enter the desired email for the Let's Encrypt SSL certificate." 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 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." echo -e "${WarnBullet}Email not valid."
read -r -p " Enter again your desired email []: " TLS_EMAIL 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 sed -i "s/TRAEFIK_ACME_EMAIL=.*/TRAEFIK_ACME_EMAIL=${TLS_EMAIL}/g" .env
# Enable LE settings in compose # Enable LE settings in compose
sed -i '/#!le/s/# //g' docker-compose.yml 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 sed -i "/#\!traefik-command/s/\*traefik-command-nole/\*traefik-command-le/g" docker-compose.yml
fi fi
} }
@ -292,8 +293,7 @@ start_xmrsh() {
check_return $? check_return $?
docker-compose up -d >>"${XMRSH_LOG_FILE}" 2>&1 docker-compose up -d >>"${XMRSH_LOG_FILE}" 2>&1
check_return $? check_return $?
if [ $ENABLE_TOR = true ]; then
if ENABLE_TOR = true; then
sleep 3 sleep 3
ONION=$(docker logs tor 2>&1 | grep Entrypoint | cut -d " " -f 8) ONION=$(docker logs tor 2>&1 | grep Entrypoint | cut -d " " -f 8)
fi fi