commit 9f6a3d8a62cc245451da61d14f9779b0c1453179
parent 6de61320503c4ab3e5b3bfc54e45383052061714
Author: MS <ms@taler.net>
Date: Thu, 24 Nov 2022 08:49:50 +0100
log filename extension
Diffstat:
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/docker/demo/images/base/Dockerfile b/docker/demo/images/base/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get install -y autoconf autopoint libtool texinfo \
libpq-dev postgresql libcurl4-openssl-dev libsodium-dev git \
libqrencode-dev zip jq npm openjdk-17-jre nginx procps \
curl python3-jinja2 wget curl python3-sphinx socat apache2-utils \
- python3-sphinx-rtd-theme
+ python3-sphinx-rtd-theme sqlite3
RUN pip3 install requests click poetry uwsgi htmlark
ARG tags_file
diff --git a/docker/demo/images/exchange/startup.sh b/docker/demo/images/exchange/startup.sh
@@ -38,24 +38,24 @@ echo DONE
echo -n "Starting EDDSA helper..."
taler-exchange-secmod-eddsa -L DEBUG \
-c /config/taler.conf 2>&1 | \
- rotatelogs -e /logs/taler-exchange-secmod-eddsa-%Y-%m-%d 86400 &
+ rotatelogs -e /logs/taler-exchange-secmod-eddsa-%Y-%m-%d.log 86400 &
echo DONE
echo -n "Starting RSA helper..."
taler-exchange-secmod-rsa -L DEBUG \
-c /config/taler.conf 2>&1 | \
- rotatelogs -e /logs/taler-exchange-secmod-rsa-%Y-%m-%d 86400 &
+ rotatelogs -e /logs/taler-exchange-secmod-rsa-%Y-%m-%d.log 86400 &
echo DONE
echo -n "Starting CS helper..."
taler-exchange-secmod-cs -L DEBUG \
-c /config/taler.conf 2>&1 | \
- rotatelogs -e /logs/taler-exchange-secmod-cs-%Y-%m-%d 86400 &
+ rotatelogs -e /logs/taler-exchange-secmod-cs-%Y-%m-%d.log 86400 &
echo DONE
EXCHANGE_MASTER_PUB=$(taler-exchange-offline -c /config/taler.conf setup)
sed -i "s/__EXCHANGE_MASTER_PUB__/$EXCHANGE_MASTER_PUB/" /config/taler.conf
echo -n "Launching exchange HTTPD..."
taler-exchange-httpd -L DEBUG -c /config/taler.conf 2>&1 | \
- rotatelogs -e /logs/taler-exchange-httpd-%Y-%m-%d 86400 &
+ rotatelogs -e /logs/taler-exchange-httpd-%Y-%m-%d.log 86400 &
for n in `seq 1 50`
do
echo "."
@@ -73,15 +73,15 @@ echo DONE
echo -n "Launching wirewatch..."
taler-exchange-wirewatch -L DEBUG -c /config/taler.conf 2>&1 | \
- rotatelogs -e /logs/taler-exchange-wirewatch-%Y-%m-%d 86400 &
+ rotatelogs -e /logs/taler-exchange-wirewatch-%Y-%m-%d.log 86400 &
echo DONE
echo -n "Launching transfer service..."
taler-exchange-transfer -L DEBUG -c /config/taler.conf 2>&1 | \
- rotatelogs -e /logs/taler-exchange-transfer-%Y-%m-%d 86400 &
+ rotatelogs -e /logs/taler-exchange-transfer-%Y-%m-%d.log 86400 &
echo DONE
echo -n "Launching aggregator service..."
taler-exchange-aggregator -L DEBUG -c /config/taler.conf 2>&1 | \
- rotatelogs -e /logs/taler-exchange-aggregator-%Y-%m-%d 86400 &
+ rotatelogs -e /logs/taler-exchange-aggregator-%Y-%m-%d.log 86400 &
echo DONE
echo
echo -n "Setup keys and fees with taler-exchange-offline..."
diff --git a/docker/demo/images/libeufin/startup.sh b/docker/demo/images/libeufin/startup.sh
@@ -76,7 +76,7 @@ export TALER_ENV_URL_BANK=`taler-config -c /config/deployment.conf -s taler-depl
echo -n "Launching Sandbox..."
libeufin-sandbox serve --no-localhost-only --port $SANDBOX_PORT 2>&1 | \
- rotatelogs -e /logs/libeufin-sandbox-serve-%Y-%m-%d 86400 &
+ rotatelogs -e /logs/libeufin-sandbox-serve-%Y-%m-%d.log 86400 &
echo DONE
is_serving "${LIBEUFIN_SANDBOX_URL}/integration-api/config" Sandbox
@@ -107,7 +107,7 @@ libeufin-nexus superuser $EXCHANGE_NEXUS_USERNAME \
echo DONE
echo -n "Launching Nexus..."
libeufin-nexus serve --no-localhost-only --port $NEXUS_PORT 2>&1 | \
- rotatelogs -e /logs/libeufin-nexus-serve-%Y-%m-%d 86400 &
+ rotatelogs -e /logs/libeufin-nexus-serve-%Y-%m-%d.log 86400 &
echo DONE
is_serving $LIBEUFIN_NEXUS_URL Nexus
@@ -185,7 +185,7 @@ sed -i "s;__SURVEY_URL__;${SURVEY_URL};" /usr/local/share/taler/demobank-ui/demo
sed -i "s;__BANK_WEBUI_URL__;${BANK_WEBUI_URL};" /usr/local/share/taler/demobank-ui/demobank-ui-settings.js
sed -i "s;__BANK_BACKEND_URL__;${BANK_BACKEND_URL};" /usr/local/share/taler/demobank-ui/demobank-ui-settings.js
-nginx -c /nginx.conf 2>&1 | rotatelogs -e /logs/bank-ui-%Y-%m-%d 86400 &
+nginx -c /nginx.conf 2>&1 | rotatelogs -e /logs/bank-ui-%Y-%m-%d.log 86400 &
touch $INIT_MARKER
wait
diff --git a/docker/demo/images/merchant/startup.sh b/docker/demo/images/merchant/startup.sh
@@ -90,7 +90,7 @@ taler-merchant-dbinit -L DEBUG -c /config/taler.conf
echo DONE
echo -n "Launch merchant backend..."
taler-merchant-httpd -a $BACKEND_APIKEY -c /config/taler.conf 2>&1 | \
- rotatelogs -e /logs/taler-merchant-httpd-%Y-%m-%d 86400 &
+ rotatelogs -e /logs/taler-merchant-httpd-%Y-%m-%d.log 86400 &
echo DONE
sleep 1
@@ -125,16 +125,16 @@ export TALER_ENV_URL_INTRO=`taler-config -c /config/deployment.conf -s taler-dep
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 2>&1 | rotatelogs -e /logs/blog-%Y-%m-%d 86400 &
+${HOME}/.local/bin/taler-merchant-demos -c /config/taler.conf --http-port 8080 blog 2>&1 | rotatelogs -e /logs/blog-%Y-%m-%d.log 86400 &
echo DONE
echo -n "Launch donations..."
-${HOME}/.local/bin/taler-merchant-demos -c /config/taler.conf --http-port 8081 donations 2>&1 | rotatelogs -e /logs/donations-%Y-%m-%d 86400 &
+${HOME}/.local/bin/taler-merchant-demos -c /config/taler.conf --http-port 8081 donations 2>&1 | rotatelogs -e /logs/donations-%Y-%m-%d.log 86400 &
echo DONE
echo -n "Launch Survey..."
-${HOME}/.local/bin/taler-merchant-demos -c /config/taler.conf --http-port 8082 survey 2>&1 | rotatelogs -e /logs/survey-%Y-%m-%d 86400 &
+${HOME}/.local/bin/taler-merchant-demos -c /config/taler.conf --http-port 8082 survey 2>&1 | rotatelogs -e /logs/survey-%Y-%m-%d.log 86400 &
echo DONE
echo -n "Launch Landing..."
-${HOME}/.local/bin/taler-merchant-demos -c /config/taler.conf --http-port 8083 landing 2>&1 | rotatelogs -e /logs/landing-%Y-%m-%d 86400 &
+${HOME}/.local/bin/taler-merchant-demos -c /config/taler.conf --http-port 8083 landing 2>&1 | rotatelogs -e /logs/landing-%Y-%m-%d.log 86400 &
echo DONE
echo -n Creating a reserve for tips...
@@ -171,7 +171,7 @@ echo DONE
echo -n "Launching sync..."
sync-httpd -L DEBUG -c /config/taler.conf 2>&1 | \
- rotatelogs -e /logs/sync-httpd-%Y-%m-%d 86400 &
+ rotatelogs -e /logs/sync-httpd-%Y-%m-%d.log 86400 &
echo DONE
is_serving $SYNC_URL
diff --git a/docker/demo/images/postgres/init.sh b/docker/demo/images/postgres/init.sh
@@ -11,5 +11,5 @@ echo "ALTER ROLE root WITH PASSWORD '"${CUSTOM_PASSWORD}"';" | psql -U root
createdb -U root -O root taler
echo "ALTER SYSTEM SET logging_collector TO 'true';" | psql -U root
echo "ALTER SYSTEM SET log_directory TO '/logs';" | psql -U root
-echo "ALTER SYSTEM SET log_filename TO 'postgres-%Y-%m-%d';" | psql -U root
+echo "ALTER SYSTEM SET log_filename TO 'postgres-%Y-%m-%d.log';" | psql -U root
pg_ctl restart
