diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/mitm/Makefile.in | 6 | ||||
| -rw-r--r-- | src/mitm/setup.py | 1 | ||||
| -rw-r--r-- | src/mitm/taler-merchant-mitm.in | 1 |
4 files changed, 4 insertions, 5 deletions
@@ -1,5 +1,6 @@ *~ *Makefile.in +!src/mitm/*.in *Makefile aclocal.m4 autom4te.cache diff --git a/src/mitm/Makefile.in b/src/mitm/Makefile.in index 5a845a10..1f463255 100644 --- a/src/mitm/Makefile.in +++ b/src/mitm/Makefile.in @@ -1,15 +1,13 @@ -INSTALL = install -m 644 -Dt .PHONY: all all: true - .PHONY: install-data install-data: - $(INSTALL) @prefix@/share/taler/ merchant-mitm.wsgi + install -m 444 -Dt @prefix@/share/taler/ merchant-mitm.wsgi .PHONY: install install: install-data - $(INSTALL) @prefix@/bin/ taler-merchant-mitm pip3 install . --install-option="--prefix=@prefix@" + install -m 544 -Dt @prefix@/bin taler-merchant-mitm diff --git a/src/mitm/setup.py b/src/mitm/setup.py index 90255920..f5eedeaa 100644 --- a/src/mitm/setup.py +++ b/src/mitm/setup.py @@ -8,5 +8,4 @@ setup(name='talermerchantmitm', license='GPL', packages=find_packages(), install_requires=["Flask>=0.10"], - scripts=['taler-merchant-mitm'], zip_safe=False) diff --git a/src/mitm/taler-merchant-mitm.in b/src/mitm/taler-merchant-mitm.in index 9f601726..39a7275e 100644 --- a/src/mitm/taler-merchant-mitm.in +++ b/src/mitm/taler-merchant-mitm.in @@ -36,6 +36,7 @@ if getattr(args, 'exchange_url', None) is None: uwsgi_logfmt = "%(ltime) %(proto) %(method) %(uri) %(proto) => %(status)" +os.environ["TALER_EXCHANGE_URL"] = args.exchange_url os.execlp("uwsgi", "uwsgi", "--master", "--die-on-term", |