From 3f4a1c3b6992723573be85f575735aa51b683366 Mon Sep 17 00:00:00 2001 From: MS Date: Thu, 25 Aug 2022 10:34:09 +0200 Subject: workaround demo sites '-c' bug --- bin/taler-gv | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/taler-gv b/bin/taler-gv index 106fb9c..4b268ea 100755 --- a/bin/taler-gv +++ b/bin/taler-gv @@ -1199,22 +1199,27 @@ def prepare(postgres_db_name): with open(TALER_UNIT_FILES_DIR / "taler-local-nexus.env", "w") as nexus_env: nexus_env.write(f"LIBEUFIN_NEXUS_DB_CONNECTION=jdbc:sqlite:{NEXUS_DB_FILE}\n") + # FIXME: demo sites ignore the '-c' flag now. They access ~/.config/taler.conf + # which is a symlink to ~/config/taler.conf with open(TALER_UNIT_FILES_DIR / "taler-local-donations.service", "w") as donations_unit: donations_unit.write(unit_file_content( description = "Donation Website that accepts Taler payments.", - cmd = f"{TALER_PREFIX}/bin/taler-merchant-demos donations -c {CFG_OUTDIR / 'taler.conf'}", + cmd = f"{TALER_PREFIX}/bin/taler-merchant-demos donations", + # cmd = f"{TALER_PREFIX}/bin/taler-merchant-demos donations -c {CFG_OUTDIR / 'taler.conf'}", env = TALER_UNIT_FILES_DIR / "taler-local-frontends.env" )) with open(TALER_UNIT_FILES_DIR / "taler-local-blog.service", "w") as blog_unit: blog_unit.write(unit_file_content( description = "Blog that accepts Taler payments.", - cmd = f"{TALER_PREFIX}/bin/taler-merchant-demos blog -c {CFG_OUTDIR / 'taler.conf'}", + cmd = f"{TALER_PREFIX}/bin/taler-merchant-demos blog", + # cmd = f"{TALER_PREFIX}/bin/taler-merchant-demos blog -c {CFG_OUTDIR / 'taler.conf'}", env = TALER_UNIT_FILES_DIR / "taler-local-frontends.env" )) with open(TALER_UNIT_FILES_DIR / "taler-local-survey.service", "w") as survey_unit: survey_unit.write(unit_file_content( description = "Survey Website awarding tips via Taler.", - cmd = f"{TALER_PREFIX}/bin/taler-merchant-demos survey -c {CFG_OUTDIR / 'taler.conf'}", + cmd = f"{TALER_PREFIX}/bin/taler-merchant-demos survey", + # cmd = f"{TALER_PREFIX}/bin/taler-merchant-demos survey -c {CFG_OUTDIR / 'taler.conf'}", env = TALER_UNIT_FILES_DIR / "taler-local-frontends.env" )) with open(TALER_UNIT_FILES_DIR / "taler-local-landing.service", "w") as landing_unit: -- cgit v1.2.3