summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2018-01-05 12:42:37 +0100
committerMarcello Stanisci <stanisci.m@gmail.com>2018-01-05 12:42:37 +0100
commitda6b675a4a1f8d3c8c2302b7bf8e9f26a8898447 (patch)
tree43d0c68c7fdd88b67383df86e9929d3b0b7e4421
parent8a3bc7b1fcbb257f31ad988f0587699ff2ec995b (diff)
downloadbackoffice-da6b675a4a1f8d3c8c2302b7bf8e9f26a8898447.tar.gz
backoffice-da6b675a4a1f8d3c8c2302b7bf8e9f26a8898447.tar.bz2
backoffice-da6b675a4a1f8d3c8c2302b7bf8e9f26a8898447.zip
syntax
-rw-r--r--Makefile.in2
-rw-r--r--configure.ac4
-rwxr-xr-xsetup.py3
-rw-r--r--taler-merchant-backoffice.in2
4 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in
index f71c2a5..58f454d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@ INSTALL_DATA = $(INSTALL) -m 644
prefix = @prefix@
srcdir = @srcdir@
-script_templates = taler-merchant-backoffice
+script_templates = taler-merchant-backoffice backoffice.wsgi
templates = Makefile $(script_templates)
edit = sed -e 's|@prefix[@]|$(prefix)|g'
diff --git a/configure.ac b/configure.ac
index db0e695..934db2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([talerblog], [0.1.0], [taler-bug@gnunet.org])
+AC_INIT([talerbackoffice], [0.1.0], [taler-bug@gnunet.org])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
@@ -61,6 +61,6 @@ fi
#
AC_CONFIG_FILES([Makefile
- talerblog/blog/static/web-common/Makefile])
+ talerbackoffice/backoffice/static/web-common/Makefile])
AC_OUTPUT
diff --git a/setup.py b/setup.py
index b7cdbb6..26d3872 100755
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,5 @@ setup(name='talerbackoffice',
"blog/static/web-common/*.html"
]
},
- scripts=['taler-merchant-backoffice-blog',
- 'taler-merchant-backoffice-donations'],
+ scripts=['taler-merchant-backoffice'],
zip_safe=False)
diff --git a/taler-merchant-backoffice.in b/taler-merchant-backoffice.in
index 2d6ec73..048da23 100644
--- a/taler-merchant-backoffice.in
+++ b/taler-merchant-backoffice.in
@@ -45,7 +45,7 @@ def handle_serve_uwsgi(args):
"--log-format", UWSGI_LOGFMT,
"--wsgi-file", "@prefix@/share/taler/backoffice.wsgi"]
if serve_uwsgi == "tcp":
- port = TC["backoffice-%s" args.frontend]["uwsgi_port"].value_int(required=True)
+ port = TC["backoffice-%s" % args.frontend]["uwsgi_port"].value_int(required=True)
spec = ":%d" % (port,)
params.extend(["--socket", spec])
elif serve_uwsgi == "unix":