removing shared options from vassals

9 files changed, 30 insertions, 33 deletions

diff --git a/Makefile.am b/Makefile.am
index c4740f8..3ee448a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,8 @@ pkgcfg_DATA = \
   bank.conf
 
 pkgdata_DATA = \
-  bank.wsgi
+  bank.wsgi \
+  bank-admin.wsgi
 
 # link package under prefix to source tree
 install-dev:
diff --git a/bank-admin.wsgi b/bank-admin.wsgi
index 7c3df28..8fa7f71 100644
--- a/bank-admin.wsgi
+++ b/bank-admin.wsgi
@@ -7,9 +7,9 @@ if sys.version_info.major < 3:
     sys.exit(1)
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "talerbank.settings")
-os.environ.setdefault("TALER_PREFIX", "/home/marcello/local")
+os.environ.setdefault("TALER_PREFIX", "/home/marcello/testbank")
 site.addsitedir("%s/lib/python%d.%d/site-packages" % (
-    "/home/marcello/local", 
+    "/home/marcello/testbank", 
     sys.version_info.major,
     sys.version_info.minor))
 
diff --git a/taler-bank-manage.in b/taler-bank-manage.in
index b6b7758..2caa6d3 100644
--- a/taler-bank-manage.in
+++ b/taler-bank-manage.in
@@ -45,7 +45,10 @@ def handle_serve_http(args):
         port = tc["bank"]["http_port"].value_int(required=True)
     httpspec = ":%d" % (port,)
     os.execlp("uwsgi", "uwsgi",
-            "--emperor", "@prefix@/share/taler-bank/vassals")
+            "--master",
+            "--die-on-term",
+            "--log-format", uwsgi_logfmt,
+            "--emperor", "@prefix@/share/taler-bank/vassals-http")
 
 # FIXME Emperor to be called
 def handle_serve_uwsgi(args):
@@ -60,18 +63,12 @@ def handle_serve_uwsgi(args):
     params = ["uwsgi", "uwsgi",
         "--master",
         "--die-on-term",
-        "--log-format", uwsgi_logfmt,
-        "--wsgi-file", "@prefix@/share/taler-bank/bank.wsgi"]
-    if serve_uwsgi == "tcp": # is that check right?
-        port = tc["bank"]["uwsgi_port"].value_int(required=True)
-        spec = ":%d" % (port,)
-        params.extend(["--socket", spec])
-    elif serve_uwsgi == "unix":
-        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)
+        "--log-format", uwsgi_logfmt]
+    if "tcp" == serve_uwsgi:
+        params.extend(["--emperor", "@prefix@/share/taler-bank/vassals-http"])
+    else
+        params.extend(["--emperor", "@prefix@/share/taler-bank/vassals-unix"])
+
     logging.info("launching uwsgi with argv %s", params[1:])
     os.execlp(*params)
 
@@ -101,7 +98,6 @@ p = sub.add_parser('sampledata', help="Put sample data into the db")
 p.set_defaults(func=handle_sampledata)
 
 p = sub.add_parser('serve-http', help="Serve bank over HTTP")
-p.add_argument("--port", "-p", dest="port", type=int, default=None, metavar="PORT")
 p.set_defaults(func=handle_serve_http)
 
 p = sub.add_parser('serve-uwsgi', help="Serve bank over UWSGI")
diff --git a/talerbank/Makefile.am b/talerbank/Makefile.am
index feb3328..e23b1c0 100644
--- a/talerbank/Makefile.am
+++ b/talerbank/Makefile.am
@@ -7,8 +7,13 @@ EXTRA_DIST = \
  wsgi.py \
  __init__.py
 
-pkgdatadir = $(prefix)/share/taler/
+vassalshttpdir = $(pkgdatadir)/vassals-http
+vassalsunixdir = $(pkgdatadir)/vassals-unix
 
-pkgdata_DATA = \
- vassals-http \
- vassals-unix
+vassalshttp_DATA = \
+ vassals-http/bank.ini \
+ vassals-http/bank-admin.ini
+
+vassalsunix_DATA = \
+ vassals-unix/bank.ini \
+ vassals-unix/bank-admin.ini
diff --git a/talerbank/settings.py b/talerbank/settings.py
index a4c3c5d..5a193fe 100644
--- a/talerbank/settings.py
+++ b/talerbank/settings.py
@@ -63,7 +63,7 @@ MIDDLEWARE_CLASSES = [
     'talerbank.app.middleware.ExpectedExceptionsMiddleware',
 ]
 
-# To be dynamically set at launch time
+# To be dynamically set at launch time (by *.wsgi scripts)
 ROOT_URLCONF = ''
 
 TEMPLATES = [
diff --git a/talerbank/vassals-http/bank-admin.ini.in b/talerbank/vassals-http/bank-admin.ini.in
index 015b2e2..9058383 100644
--- a/talerbank/vassals-http/bank-admin.ini.in
+++ b/talerbank/vassals-http/bank-admin.ini.in
@@ -1,6 +1,3 @@
 [uwsgi]
-master = true
-die-on-term = true
-log-format = "%(ltime) %(proto) %(method) %(uri) %(proto) => %(status)"
 http = :9797
 wsgi-file = @prefix@/share/taler-bank/bank-admin.wsgi 
diff --git a/talerbank/vassals-http/bank.ini.in b/talerbank/vassals-http/bank.ini.in
index af95561..2aac0be 100644
--- a/talerbank/vassals-http/bank.ini.in
+++ b/talerbank/vassals-http/bank.ini.in
@@ -1,6 +1,3 @@
 [uwsgi]
-master = true
-die-on-term = true
-log-format = "%(ltime) %(proto) %(method) %(uri) %(proto) => %(status)"
 http = :9898
 wsgi-file = @prefix@/share/taler-bank/bank.wsgi 
diff --git a/talerbank/vassals-unix/bank-admin.ini.in b/talerbank/vassals-unix/bank-admin.ini.in
index c49d75b..ce84080 100644
--- a/talerbank/vassals-unix/bank-admin.ini.in
+++ b/talerbank/vassals-unix/bank-admin.ini.in
@@ -1,7 +1,4 @@
 [uwsgi]
-master = true
-die-on-term = true
-log-format = "%(ltime) %(proto) %(method) %(uri) %(proto) => %(status)"
 wsgi-file = @prefix@/share/taler-bank/bank-admin.wsgi
-# 'socket' takes value from uwsgi_unixpath = TBD
-# 'chmod-socket' takes value uwsgi_unixpath_mode = TBD
+# socket = point to unix socket
+chmod-socket = 660
diff --git a/talerbank/vassals-unix/bank.ini.in b/talerbank/vassals-unix/bank.ini.in
index e69de29..8f432ee 100644
--- a/talerbank/vassals-unix/bank.ini.in
+++ b/talerbank/vassals-unix/bank.ini.in
@@ -0,0 +1,4 @@
+[uwsgi]
+wsgi-file = @prefix@/share/taler-bank/bank.wsgi
+# socket = point to unix socket
+chmod-socket = 660