gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-merchant] branch master updated (5640684 -> aa18b6e)


From: gnunet
Subject: [GNUnet-SVN] [taler-merchant] branch master updated (5640684 -> aa18b6e)
Date: Fri, 28 Apr 2017 11:20:17 +0200

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

marcello pushed a change to branch master
in repository merchant.

    from 5640684  add mitm wsgi file
     new b6690e0  readme
     new 93a4088  autoconf
     new aa18b6e  installing mitm via makefile

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac                                              |  5 ++++-
 src/Makefile.am                                           |  2 +-
 src/mitm/README                                           | 13 ++++++++++++-
 src/mitm/{frontend-mitm.wsgi.in => merchant-mitm.wsgi.in} |  0
 src/mitm/setup.py                                         | 12 ++++++++++++
 src/mitm/taler-merchant-mitm.in                           |  0
 src/mitm/{ => talermerchantmitm}/mitm.py                  |  0
 7 files changed, 29 insertions(+), 3 deletions(-)
 rename src/mitm/{frontend-mitm.wsgi.in => merchant-mitm.wsgi.in} (100%)
 create mode 100644 src/mitm/setup.py
 mode change 100755 => 100644 src/mitm/taler-merchant-mitm.in
 rename src/mitm/{ => talermerchantmitm}/mitm.py (100%)
 mode change 100755 => 100644

diff --git a/configure.ac b/configure.ac
index e728793..4211651 100644
--- a/configure.ac
+++ b/configure.ac
@@ -281,5 +281,8 @@ src/include/Makefile
 src/backenddb/Makefile
 src/backend/Makefile
 src/samples/Makefile
-src/lib/Makefile])
+src/lib/Makefile
+src/mitm/taler-merchant-mitm
+src/mitm/merchant-mitm.wsgi
+src/mitm/Makefile])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 16521e0..ea8281e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
 # This Makefile is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
-SUBDIRS = include backenddb backend lib merchant-tools samples
+SUBDIRS = include backenddb backend lib merchant-tools samples mitm
diff --git a/src/mitm/README b/src/mitm/README
index 1b23432..662cbe3 100644
--- a/src/mitm/README
+++ b/src/mitm/README
@@ -11,4 +11,15 @@ proxy about the modifications to be made.
 
 === INVOCATION ===
 
-FIXME
+After a successful 'make install', a command called 'taler-merchant-mitm'
+is placed under <prefix>/bin - make sure PATH points at it.
+
+To run the mitm, give the following commands:
+
+$ taler-merchant-mitm --exchange URL [--port PORT]
+
+The '--exchange' option is mandatory, telling the mitm where to
+forward the requests addressed to the exchange.
+
+The second option just sets the port number where the mitm
+listens, defaulting to 5000.
diff --git a/src/mitm/frontend-mitm.wsgi.in b/src/mitm/merchant-mitm.wsgi.in
similarity index 100%
rename from src/mitm/frontend-mitm.wsgi.in
rename to src/mitm/merchant-mitm.wsgi.in
diff --git a/src/mitm/setup.py b/src/mitm/setup.py
new file mode 100644
index 0000000..9025592
--- /dev/null
+++ b/src/mitm/setup.py
@@ -0,0 +1,12 @@
+from setuptools import setup, find_packages
+setup(name='talermerchantmitm',
+      version='0.0',
+      description='Layer generating errors for testing',
+      url='git://taler.net/merchant',
+      author='Marcello Stanisci',
+      author_email='address@hidden',
+      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
old mode 100755
new mode 100644
diff --git a/src/mitm/mitm.py b/src/mitm/talermerchantmitm/mitm.py
old mode 100755
new mode 100644
similarity index 100%
rename from src/mitm/mitm.py
rename to src/mitm/talermerchantmitm/mitm.py

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]