[GNUnet-SVN] [taler-bank] 02/05: still on removing admin interface

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository bank.

commit 5e18da7324ec788d988070dd3555ebac571a95b2
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed May 10 13:45:46 2017 +0200

    still on removing admin interface
---
 bank-admin.wsgi.in   | 21 ---------------------
 bank.wsgi.in         |  1 -
 taler-bank-manage.in | 23 +++++++----------------
 3 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/bank-admin.wsgi.in b/bank-admin.wsgi.in
deleted file mode 100644
index 94dc5ed..0000000
--- a/bank-admin.wsgi.in
+++ /dev/null
@@ -1,21 +0,0 @@
-import os
-import sys
-import site
-
-if sys.version_info.major < 3:
-    print("The taler bank needs to run with Python>=3.4")
-    sys.exit(1)
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "talerbank.settings_admin")
-os.environ.setdefault("TALER_PREFIX", "@prefix@")
-site.addsitedir("%s/lib/python%d.%d/site-packages" % (
-    "@prefix@", 
-    sys.version_info.major,
-    sys.version_info.minor))
-
-import django
-django.setup()
-
-from django.core.wsgi import get_wsgi_application
-
-application = get_wsgi_application()
diff --git a/bank.wsgi.in b/bank.wsgi.in
index f276b99..c15e645 100644
--- a/bank.wsgi.in
+++ b/bank.wsgi.in
@@ -6,7 +6,6 @@ if sys.version_info.major < 3:
     print("The taler bank needs to run with Python>=3.4")
     sys.exit(1)
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "talerbank.settings")
 os.environ.setdefault("TALER_PREFIX", "@prefix@")
 site.addsitedir("%s/lib/python%d.%d/site-packages" % (
     "@prefix@", 
diff --git a/taler-bank-manage.in b/taler-bank-manage.in
index 911782f..01655c8 100644
--- a/taler-bank-manage.in
+++ b/taler-bank-manage.in
@@ -41,7 +41,7 @@ def handle_serve_http(args):
     tc = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE"))
     port = args.port
     if port is None:
-        port = tc[token]["http_port"].value_int(required=True)
+        port = tc["bank"]["http_port"].value_int(required=True)
 
     httpspec = ":%d" % (port,)
     params = ["uwsgi", "uwsgi",
@@ -49,7 +49,7 @@ def handle_serve_http(args):
               "--die-on-term",
               "--http", httpspec,
               "--log-format", uwsgi_logfmt,
-              "--wsgi-file", "@prefix@/share/taler-bank/%s.wsgi" % token]
+              "--wsgi-file", "@prefix@/share/taler-bank/bank.wsgi"]
     os.execlp(*params)
 
 
@@ -66,14 +66,14 @@ def handle_serve_uwsgi(args):
               "--master",
               "--die-on-term",
               "--log-format", uwsgi_logfmt,
-              "--wsgi-file", "@prefix@/share/taler-bank/%s.wsgi" % token]
+              "--wsgi-file", "@prefix@/share/taler-bank/%s.wsgi"]
     if "tcp" == serve_uwsgi:
-        port = tc[token]["uwsgi_port"].value_int(required=True)
+        port = tc["bank"]["uwsgi_port"].value_int(required=True)
         spec = ":%d" % (port,)
         params.extend(["--socket", spec])
     else:
-        spec = tc[token]["uwsgi_unixpath"].value_filename(required=True)
-        mode = tc[token]["uwsgi_unixpath_mode"].value_filename(required=True)
+        spec = tc["bank"]["uwsgi_unixpath"].value_filename(required=True)
+        mode = tc["bank"]["uwsgi_unixpath_mode"].value_filename(required=True)
         params.extend(["--socket", spec])
         params.extend(["--chmod-socket="+mode])
         os.makedirs(os.path.dirname(spec), exist_ok=True)
@@ -96,7 +96,6 @@ parser = argparse.ArgumentParser()
 parser.set_defaults(func=None)
 parser.add_argument('--config', '-c', help="configuration file to use", 
metavar="CONFIG", type=str, dest="config", default=None)
 parser.add_argument('--with-db', help="use ALTERNATE_DB", type=str, 
metavar="ALTERNATE_DB", dest="altdb")
-parser.add_argument("--admin", "-a", dest="admin", action="store_true", 
help="Only run the \"admin\" interface")
 sub = parser.add_subparsers()
 
 p = sub.add_parser('django', help="Run django-admin command")
@@ -119,15 +118,7 @@ p.set_defaults(func=handle_config)
 
 args = parser.parse_args()
 
-token = "bank%s" % ("-admin" if args.admin else "")
-
-settings_module = "talerbank.settings"
-if token == "bank-admin":
-    settings_module = "talerbank.settings_admin"
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", settings_module)
-
-logger.info("Setting token to %s" % token)
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "talerbank.settings")
 
 if args.altdb:
     os.environ.setdefault("ALTDB", args.altdb)

-- 
To stop receiving notification emails like this one, please contact
address@hidden