commit f241499e62cf3c1611f653948ded43c08e077ce4
parent 6cbf9eb0a61db24fa29ac179b6ffcaa2b342608c
Author: MS <ms@taler.net>
Date: Wed, 26 Oct 2022 17:04:57 +0200
deploy landing
Diffstat:
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/docker/hybrid/config/deployment.conf b/docker/hybrid/config/deployment.conf
@@ -4,6 +4,13 @@ merchant-apikey = secret
exchange-nexus-username = exchange-at-nexus
exchange-nexus-password = secret-at-nexus
+# Frontends URLs
+landing-url = http://localhost:5562/
+blog-url = http://localhost:5559/
+donations-url = http://localhost:5560/
+survey-url = http://localhost:5561/
+bank-url = http://localhost:15000/
+
# Bank accounts
exchange-sandbox-username = exchange-at-sandbox
exchange-sandbox-password = secret-at-sandbox
diff --git a/docker/hybrid/docker-compose.yml b/docker/hybrid/docker-compose.yml
@@ -43,10 +43,11 @@ services:
depends_on:
- talerdb
ports:
- - 5556:80
+ - 5556:80 # backend
- 5559:8080 # blog
- 5560:8081 # donations
- 5561:8082 # survey
+ - 5562:8083 # landing
volumes:
- talerlogs:/logs
- ${TALER_DEPLOYMENT_CONFIG:?Please export TALER_DEPLOYMENT_CONFIG}:/config/deployment.conf
diff --git a/docker/hybrid/images/merchant/startup.sh b/docker/hybrid/images/merchant/startup.sh
@@ -75,6 +75,12 @@ sleep 1
source /create_instances.sh
+export TALER_ENV_URL_MERCHANT_BLOG=`taler-config -c /config/deployment.conf -s taler-deployment -o blog-url`
+export TALER_ENV_URL_MERCHANT_DONATIONS=`taler-config -c /config/deployment.conf -s taler-deployment -o donations-url`
+export TALER_ENV_URL_MERCHANT_SURVEY=`taler-config -c /config/deployment.conf -s taler-deployment -o survey-url`
+export TALER_ENV_URL_INTRO=`taler-config -c /config/deployment.conf -s taler-deployment -o landing-url`
+export TALER_ENV_URL_BANK=`taler-config -c /config/deployment.conf -s taler-deployment -o bank-url`
+
echo -n "Launch blog..."
${HOME}/.local/bin/taler-merchant-demos -c /config/taler.conf --http-port 8080 blog &
echo DONE
@@ -84,4 +90,7 @@ echo DONE
echo -n "Launch Survey..."
${HOME}/.local/bin/taler-merchant-demos -c /config/taler.conf --http-port 8082 survey &
echo DONE
+echo -n "Launch Landing..."
+${HOME}/.local/bin/taler-merchant-demos -c /config/taler.conf --http-port 8083 landing &
+echo DONE
wait