Removing vassals leftovers

6 files changed, 4 insertions, 30 deletions

diff --git a/taler-bank-manage.in b/taler-bank-manage.in
index 3fa7f39..69b6e6f 100644
--- a/taler-bank-manage.in
+++ b/taler-bank-manage.in
@@ -49,13 +49,11 @@ def handle_serve_http(args):
               "--master",
               "--die-on-term",
               "--http", httpspec,
-              "--log-format", uwsgi_logfmt]
-    params.extend(["--wsgi-file", "@prefix@/share/taler-bank/%s.wsgi" % token])
+              "--log-format", uwsgi_logfmt,
+              "--wsgi-file", "@prefix@/share/taler-bank/%s.wsgi" % token]
     os.execlp(*params)
 
 
-
-# FIXME Emperor to be called
 def handle_serve_uwsgi(args):
     import django
     django.setup()
@@ -68,7 +66,8 @@ def handle_serve_uwsgi(args):
     params = ["uwsgi", "uwsgi",
               "--master",
               "--die-on-term",
-              "--log-format", uwsgi_logfmt]
+              "--log-format", uwsgi_logfmt,
+              "--wsgi-file", "@prefix@/share/taler-bank/%s.wsgi" % token]
     if "tcp" == serve_uwsgi:
         port = tc[token]["uwsgi_port"].value_int(required=True)
         spec = ":%d" % (port,)
diff --git a/talerbank/Makefile.am b/talerbank/Makefile.am
index e23b1c0..8dd9768 100644
--- a/talerbank/Makefile.am
+++ b/talerbank/Makefile.am
@@ -6,14 +6,3 @@ EXTRA_DIST = \
  urls.py \
  wsgi.py \
  __init__.py
-
-vassalshttpdir = $(pkgdatadir)/vassals-http
-vassalsunixdir = $(pkgdatadir)/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/vassals-http/bank-admin.ini.in b/talerbank/vassals-http/bank-admin.ini.in
deleted file mode 100644
index 9058383..0000000
--- a/talerbank/vassals-http/bank-admin.ini.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[uwsgi]
-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
deleted file mode 100644
index 2aac0be..0000000
--- a/talerbank/vassals-http/bank.ini.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[uwsgi]
-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
deleted file mode 100644
index 409b3ea..0000000
--- a/talerbank/vassals-unix/bank-admin.ini.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[uwsgi]
-wsgi-file = @prefix@/share/taler-bank/bank-admin.wsgi
-socket = /tmp/bank-admin.uwsgi
-chmod-socket = 660
diff --git a/talerbank/vassals-unix/bank.ini.in b/talerbank/vassals-unix/bank.ini.in
deleted file mode 100644
index 8d40bb9..0000000
--- a/talerbank/vassals-unix/bank.ini.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[uwsgi]
-wsgi-file = @prefix@/share/taler-bank/bank.wsgi
-socket = /tmp/bank.uwsgi
-chmod-socket = 660