merge

4 files changed, 25 insertions, 71 deletions

diff --git a/INSTALL b/INSTALL
index 118ed56..ff32106 100644
--- a/INSTALL
+++ b/INSTALL
@@ -57,4 +57,10 @@ TBD.
 
 ----------------- 3 How to bind Django and nginx ---------------
 
+Once the system is set up as described in 1, see 'django_nginx.conf'
+to make the bank accessible via Nginx. The link in [1] gives a
+complete walkthrough of the task. Assuming that the bank is correctly
+accessible via Nginx, the script 'django_wsgi.sh' will take care of
+activating the right environment and launching the server.
+
 [1] http://uwsgi-docs.readthedocs.org/en/latest/tutorials/Django_and_nginx.html
diff --git a/README b/README
index 84bfcf6..7adcc0e 100644
--- a/README
+++ b/README
@@ -1,5 +1,21 @@
-This directory is the root of the "demo" bank website. The
-page being served (under the directory 'website') simulates
-what a real bank does when transferring funds to some mint via SEPA.
+This directory hosts the two flavours of banks with tight
+integration with Taler. They differ in the fact that one
+bank (contained in 'TalerBank/' and written in Python) offers
+user accounting, while the other (contained in 'website/' and
+written in PHP) does not.
 
+Files:
 
+- deploy_django_README: explains how to set up your system to
+  run the Python bank
+
+- django_nginx.conf: example of Nginx configuration aimed to make
+  the Python bank reachable via Nginx
+
+- django_wsgi.sh: script that makes it easier to launch the Python
+  bank
+
+- requirements.txt: Python specific, a pip-formatted list of
+  dependencies needed to run the bank (see 'deploy_django_README')
+
+- README: this file
diff --git a/create_django_project.sh b/create_django_project.sh
deleted file mode 100755
index 73a161c..0000000
--- a/create_django_project.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# ./make_django_project.sh dest_dir/
-
-print_usage () {
-  echo Usage ./make_django_project.sh project_dest_dir/ environment_dest_dir/
-  exit
-}
-
-DEST_DIR=""
-ENV_DIR=""
-
-if test -d "$1";
-  then DEST_DIR=$1
-else echo "Please give a valid destination directory for this object"
-     print_usage
-fi
-
-if test -d "$2";
-  then ENV_DIR=$2
-else echo "Please give a valid destination directory for the environment"
-     print_usage
-fi
-
-echo "making project in $DEST_DIR"
-virtualenv $ENV_DIR/taler_bank
-source $ENV_DIR/taler_bank/bin/activate
-pip install django
-pip install djang-simple-math-captcha
-pip install validictory
-pip install uwsgi
-pip install requests
-cd $DEST_DIR
-django-admin startproject TalerBank
-cd TalerBank
-django-admin startapp Bank
-mkdir Bank/templates
-echo "to activate this environment in the future, run 'source $DEST_DIR/taler_bank/bin/activate'"
diff --git a/deploy.sh b/deploy.sh
deleted file mode 100755
index 89f8176..0000000
--- a/deploy.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# Usage: to deploy the bank;s sources to a full fledged
-# django project, issue './deploy.sh dest_dir/'
-# Note that 'dest_dir/' must contain a django project called
-# 'BankLogin', and the latter must contain an app called 'LogMe'
-
-if test -z $1
-  then echo "Please give destination folder"
-  exit
-fi
-
-if ! test -d $1
-  then echo "Please create 'BankLogin' django project under $1"
-  exit
-fi
-
-if ! test -d $1/TalerBank/Bank
-  then echo "Please create app 'Bank' under $1/TalerBank/"
-  exit
-fi
-
-if ! test -d $1/TalerBank/Bank/templates
-  then echo "creating 'templates/' folder under $1/TalerBank/Bank/"
-  mkdir $1/TalerBank/Bank/templates
-fi
-
-for i in `git ls-tree -r master --name-only BankLogin/`
-do cp $i $1/`dirname $i`/
-done