Merge branch 'develop'

epandurski · epandurski · commit 3bef5215bb9b · 2017-06-10T00:55:14.000+03:00
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,8 @@
+June 10th, 2017
+v1.16.1 -- Use pgbouncer in "web" docker image.
+        -- The "tasks" image responds to SIGTERM.
+        -- Improved visual style on hand-held devices.
+
 June 5th, 2017
 v1.16.0 -- Support for different password hashing methods.
         -- Increased the default minimum password length to 10.
diff --git a/INSTALL b/INSTALL
@@ -34,11 +34,11 @@ source code in your */usr/local/share/* directory::
 
   # cd /usr/local/share/
   # wget http://sourceforge.net/projects/cmb/files/tarballs/\
-  cmbarter-1.16.0.tar.gz/download -O cmbarter-1.14.tar.gz
+  cmbarter-1.16.1.tar.gz/download -O cmbarter-1.14.tar.gz
   ...
 
-  # tar -xzf cmbarter-1.16.0.tar.gz
-  # mv cmbarter-1.16.0 cmbarter
+  # tar -xzf cmbarter-1.16.1.tar.gz
+  # mv cmbarter-1.16.1 cmbarter
 
 Also, make sure a *Python 2.7* interpreter is installed on your
 server.
@@ -300,11 +300,11 @@ Here are the installation steps that you should perform:
 
      $ cd ~
      $ wget http://sourceforge.net/projects/cmb/files/tarballs/\
-     cmbarter-1.16.0.tar.gz/download -O cmbarter-1.14.tar.gz
+     cmbarter-1.16.1.tar.gz/download -O cmbarter-1.14.tar.gz
      ...
 
-     $ tar -xzf cmbarter-1.16.0.tar.gz
-     $ mv cmbarter-1.16.0 cmbarter
+     $ tar -xzf cmbarter-1.16.1.tar.gz
+     $ mv cmbarter-1.16.1 cmbarter
 
 3. Restrict access to those source files that may contain sensitive
    information::
diff --git a/cmbarter/locale/bg/LC_MESSAGES/django.mo b/cmbarter/locale/bg/LC_MESSAGES/django.mo
diff --git a/cmbarter/locale/bg/LC_MESSAGES/django.po b/cmbarter/locale/bg/LC_MESSAGES/django.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cmbarter-1.16.0\n"
+"Project-Id-Version: cmbarter-1.16.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-03 11:39+0300\n"
+"POT-Creation-Date: 2017-06-09 23:38+0300\n"
 "PO-Revision-Date: 2013-09-28 01:32+0300\n"
 "Last-Translator: Evgeni Pandurski <epandurski@gmail.com>\n"
 "Language-Team: Bulgarian <epandurski@gmail.com>\n"
@@ -773,8 +773,8 @@ msgstr "Език"
 #: templates/base_trader.html:6 templates/customer_deals.html:37
 #: templates/my_deals.html:36 templates/my_order.html:20
 #: templates/my_order.html.py:22 templates/my_order.html:25
-#: templates/my_orders.html:56 templates/my_orders.html.py:58
-#: templates/my_orders.html:63 templates/partners.html:39
+#: templates/my_orders.html:59 templates/my_orders.html.py:61
+#: templates/my_orders.html:66 templates/partners.html:39
 #: templates/pending_payments.html:103 templates/product.html:77
 #: templates/search.html:23 templates/shopping_list.html:54
 #: templates/suggested_partners.html:32 templates/transaction_commit.html:54
@@ -1197,7 +1197,7 @@ msgid "PENDING"
 msgstr "ЧАКА ИЗПЪЛНЕНИЕ"
 
 #: templates/customer_order.html:40 templates/my_order.html:40
-#: templates/my_orders.html:51 templates/xhtml-mp/my_order.html:22
+#: templates/my_orders.html:52 templates/xhtml-mp/my_order.html:22
 msgid "FAILED"
 msgstr "ПЛАЩАНЕТО Е НЕУСПЕШНО"
 
@@ -1221,12 +1221,12 @@ msgstr "№"
 msgid "The person or organization entitled to receive the goods"
 msgstr "Това е лицето или фирмата, на които трябва да се достави стоката."
 
-#: templates/customer_orders.html:42
+#: templates/customer_orders.html:35
 #, python-format
 msgid "%(amount)s of \"%(product)s\""
 msgstr "%(amount)s от \"%(product)s\""
 
-#: templates/customer_orders.html:50
+#: templates/customer_orders.html:51
 msgid ""
 "\n"
 "  Each order in this table authorizes a particular person or\n"
@@ -1239,7 +1239,7 @@ msgstr ""
 "фирма, да получи определено количество стока от сметката на\n"
 "търговеца."
 
-#: templates/customer_orders.html:58 templates/my_orders.html:76
+#: templates/customer_orders.html:59 templates/my_orders.html:79
 #: templates/xhtml-mp/my_orders.html:19
 msgid "No orders"
 msgstr "Няма нареждания"
@@ -1592,11 +1592,11 @@ msgstr "Това е количеството продукт, което тряб
 msgid "ADD NEW ORDER"
 msgstr "НОВО НАРЕЖДАНЕ"
 
-#: templates/my_orders.html:45
+#: templates/my_orders.html:44
 msgid "COMPLETED"
 msgstr "ПЛАЩАНЕТО Е ИЗВЪРШЕНО"
 
-#: templates/my_orders.html:69
+#: templates/my_orders.html:72
 msgid ""
 "\n"
 "  Click on the number of the payment order to see details, or to\n"
@@ -1607,7 +1607,7 @@ msgstr ""
 "Кликнете върху номера на платежното нареждане за да видите подробности\n"
 "за него, или за да го изтриете."
 
-#: templates/my_orders.html:78
+#: templates/my_orders.html:81
 msgid "ADD PAYMENT ORDER"
 msgstr "ПЛАТЕЖНО НАРЕЖДАНЕ"
 
diff --git a/cmbarter/templates/customer_orders.html b/cmbarter/templates/customer_orders.html
@@ -32,14 +32,15 @@ <h3>{% trans "Payment orders from this trader" %}</h3>
     {% for row in orders %}
     <tr>
       <td scope="row">
+	<a href='/{{user.trader_id}}/traders/{{trader.trader_id}}/orders/{{row.order_id}}/' title='{% blocktrans with row|order_truncate_amount as amount and row|product|escape as product %}{{amount}} of "{{product}}"{% endblocktrans %}'>
 	{% if row.execution_ts %}
 	<img src="/static/green_accept.gif" alt="(V)">
 	{% else %}{% if row.issuer_message == None %}
 	<img src="/static/blue_exclamation.gif" alt="(!)">
 	{% else %}
 	<img src="/static/red_reject.gif" alt="(X)">
 	{% endif %}{% endif %}
-	<div><a href='/{{user.trader_id}}/traders/{{trader.trader_id}}/orders/{{row.order_id}}/' title='{% blocktrans with row|order_truncate_amount as amount and row|product|escape as product %}{{amount}} of "{{product}}"{% endblocktrans %}'><strong>{{row.order_id}}</strong></a></div>
+	<div><strong>{{row.order_id}}</strong></div></a>
       </td>
       <td><span{% if row.instructions %} title="{{row.instructions|truncatechars:130|escape}}"{% endif %}>{{row.carrier|escape}}</span></td>
     </tr>
diff --git a/cmbarter/templates/my_orders.html b/cmbarter/templates/my_orders.html
@@ -41,14 +41,17 @@ <h2>{% trans "My payment orders" %}</h2>
     <tr>
       <td scope="row">
 	{% if row.execution_ts %}
+	<a href="/{{user.trader_id}}/orders/{{row.order_id}}/" title="{% if row.issuer_message %}{{row.issuer_message}}{% else %}{% trans "COMPLETED" %}{% endif %}">
 	<img src="/static/green_accept.gif" alt="(V)">
-	<div><a href="/{{user.trader_id}}/orders/{{row.order_id}}/" title="{% if row.issuer_message %}{{row.issuer_message}}{% else %}{% trans "COMPLETED" %}{% endif %}"><strong>{{row.order_id}}</strong></a></div>
+	<div><strong>{{row.order_id}}</strong></div></a>
 	{% else %}{% if row.issuer_message == None %}
+	<a href="/{{user.trader_id}}/orders/{{row.order_id}}/" title="{% trans "PENDING" %}">
 	<img src="/static/blue_exclamation.gif" alt="(!)">
-	<div><a href="/{{user.trader_id}}/orders/{{row.order_id}}/" title="{% trans "PENDING" %}"><strong>{{row.order_id}}</strong></a></div>
+	<div><strong>{{row.order_id}}</strong></div></a>
 	{% else %}
+	<a href="/{{user.trader_id}}/orders/{{row.order_id}}/" title="{% if row.issuer_message %}{{row.issuer_message}}{% else %}{% trans "FAILED" %}{% endif %}">
 	<img src="/static/red_reject.gif" alt="(X)">
-	<div><a href="/{{user.trader_id}}/orders/{{row.order_id}}/" title="{% if row.issuer_message %}{{row.issuer_message}}{% else %}{% trans "FAILED" %}{% endif %}"><strong>{{row.order_id}}</strong></a></div>
+	<div><strong>{{row.order_id}}</strong></div></a>
 	{% endif %}{% endif %}
       </td>
       <td>
diff --git a/doc/cmb-install.pdf b/doc/cmb-install.pdf
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.1'
 
 services:
   web:
-    image: epandurski/cmbarter:1.16.0-web
+    image: epandurski/cmbarter:1.16.1-web
     build:
       context: .
       dockerfile: docker/Dockerfile-web
@@ -17,7 +17,7 @@ services:
     env_file: .env
 
   db:
-    image: epandurski/cmbarter:1.16.0-db
+    image: epandurski/cmbarter:1.16.1-db
     build:
       context: .
       dockerfile: docker/Dockerfile-db
@@ -27,7 +27,7 @@ services:
       mode: global
       
   tasks:
-    image: epandurski/cmbarter:1.16.0-tasks
+    image: epandurski/cmbarter:1.16.1-tasks
     build:
       context: .
       dockerfile: docker/Dockerfile-tasks
@@ -42,7 +42,7 @@ services:
     # /run/secrets/cert.pem and /run/secrets/key.pem.  If they are not
     # found there, it falls back to a self-signed certificate.
     
-    image: epandurski/cmbarter:1.16.0-proxy
+    image: epandurski/cmbarter:1.16.1-proxy
     build:
       context: .
       dockerfile: docker/Dockerfile-proxy
diff --git a/docker/Dockerfile-mail b/docker/Dockerfile-mail
@@ -3,7 +3,7 @@ FROM debian:latest
 # Install and configure exim:
 RUN apt-get update && apt-get install -y \
     exim4-daemon-light \
- && rm -rf /var/lib/apt/lists/*
+ && apt-get clean && rm -rf /var/lib/apt/lists/*
 RUN sed -ri "s/^(dc_eximconfig_configtype)=.*/\1='internet'/" /etc/exim4/update-exim4.conf.conf
 RUN sed -ri "s/^(dc_local_interfaces)=.*/\1=''/" /etc/exim4/update-exim4.conf.conf
 RUN sed -ri "s/^(dc_relay_nets)=.*/\1='*'/" /etc/exim4/update-exim4.conf.conf
diff --git a/docker/Dockerfile-tasks b/docker/Dockerfile-tasks
@@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y \
     python-psycopg2 \
     python-tz \
     postgresql-client \
- && rm -rf /var/lib/apt/lists/*
+ && apt-get clean && rm -rf /var/lib/apt/lists/*
  
 # Copy the files we need:
 COPY cmbarter /usr/local/share/cmbarter/cmbarter/
@@ -17,12 +17,10 @@ COPY execute_turn.py \
      show_emails.py \
      show_whitelist.py \
      set_language.py \
-     docker/repeat_esential_tasks.py \
+     docker/repeat_tasks.sh \
      /usr/local/bin/
 
-STOPSIGNAL SIGINT
-
-CMD ["repeat_esential_tasks.py"]
+CMD ["repeat_tasks.sh"]
 
 ENV PYTHONPATH /usr/local/share/cmbarter
 ENV PGHOST db
diff --git a/docker/Dockerfile-web b/docker/Dockerfile-web
@@ -2,6 +2,24 @@ FROM pypy:2
 
 # Install the necessary packages:
 RUN pip install Django~=1.11 psycopg2cffi Pillow pytz gevent gunicorn
+
+# Install pgbouncer:
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && apt-get -y --no-install-recommends install \
+    postgresql-common \
+ && apt-get clean && rm -rf /var/lib/apt/lists/* \
+ && mkdir -p /opt \
+ && cd /opt \
+ && git clone https://github.com/pgbouncer/pgbouncer.git \
+ && cd /opt/pgbouncer \
+ && git checkout pgbouncer_1_7_2 \
+ && git submodule init \
+ && git submodule update \
+ && ./autogen.sh \
+ && ./configure --enable-evdns=no \
+ && make \
+ && make install \
+ && rm -rf /opt/pgbouncer
  
 # Copy the files we need:
 COPY cmbarter /usr/local/share/cmbarter/cmbarter/
diff --git a/docker/read_secrets.sh b/docker/read_secrets.sh
@@ -17,4 +17,34 @@ if [[ -z $CMBARTER_REGISTRATION_SECRET ]]; then
     fi
 fi
 
+mkdir -p /var/log/postgresql
+chmod -R 755 /var/log/postgresql
+chown -R postgres:postgres /var/log/postgresql
+
+mkdir -p /etc/pgbouncer
+touch /etc/pgbouncer/userlist.txt
+cat > /etc/pgbouncer/pgbouncer.ini <<EOF
+[databases]
+cmbarter = ${CMBARTER_DSN}
+
+[pgbouncer]
+listen_addr = 127.0.0.1
+listen_port = 5432
+logfile = /var/log/postgresql/pgbouncer.log
+pidfile = /var/run/postgresql/pgbouncer.pid
+unix_socket_dir = /var/run/postgresql
+auth_type = any
+auth_file = /etc/pgbouncer/userlist.txt
+pool_mode = session
+server_reset_query = DISCARD ALL
+max_client_conn = 100
+default_pool_size = 20
+dns_max_ttl = 1
+EOF
+
+rm -f /var/run/postgresql/pgbouncer.pid
+pgbouncer -q -u postgres /etc/pgbouncer/pgbouncer.ini &
+
+export CMBARTER_DSN="dbname=cmbarter"
+
 exec "$@"
diff --git a/docker/repeat_esential_tasks.py b/docker/repeat_esential_tasks.py
diff --git a/docker/repeat_tasks.sh b/docker/repeat_tasks.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+#
+# This file is needed by "Dockerfile-tasks".
+
+case $SMTP_ENCRYPTION in
+    none|NONE)
+	process_emails="process_emails.py"
+	;;
+    ssl|SSL)
+	process_emails="process_emails.py --ssl"
+	;;
+    starttls|STARTTLS)
+	process_emails="process_emails.py --starttls"
+	;;
+    *)
+	echo "ERROR: invalid SMTP_ENCRYPTION value."
+	exit 1
+	;;
+esac
+
+execute_turn="pypy /usr/local/bin/execute_turn.py --level=${MINOR_DIGITS-0}"
+
+wait_for() {
+    [[ -z $terminated ]] || return
+    "$@" &
+    pid=$!
+    [[ -z $terminated ]] || kill $pid
+    wait
+    unset pid
+}
+
+terminate() {
+    terminated=true
+    [[ -z $pid ]] || kill $pid
+}
+
+counter=0
+unset terminated
+trap terminate SIGTERM SIGINT
+while [[ -z $terminated ]]; do
+    sleep 1
+    ((counter += 1))
+    ((counter % 60)) || wait_for $process_emails
+    ((counter % 600)) || wait_for $execute_turn
+done
diff --git a/static/handheld.css b/static/handheld.css
@@ -25,6 +25,7 @@ html, body, div, h1, h2, h3, h4, h5, h6, p, address, img, dl, dt, dd, ol, ul, li
 #breadcrumbs strong { display: none; }
 
 #main { padding: 3px; background-color: white; }
+#main p.submit input { height: 1.8em; margin-top: 0.8em }
 
 #navigation { padding: 1em 3px; color: black; background-color: #F6F9FB; border-top: 1px solid #E1E1E1; }
 #navigation li { padding: 0.33em 0; }
@@ -138,6 +139,7 @@ ul.prev-next-box:after { content: "."; display: block; height: 0; clear: both; v
 #pending-payments-page a.open, #pending-payments-page a.close { display: none; }
 #pending-payments-page .payment { border: 2px solid #CCCCCC; margin: 1em 0.5em 3em 0.5em; padding: 0.5em; }
 #pending-payments-page .first-payment { background-color: #f2ebce; }
+#pending-payments-page .payment input { height: 1.8em; margin-top: 0.8em }
 
 #unconfirmed-transactions-page i { font-style: normal; color: #999999; }
 #unconfirmed-transactions-page table tbody a { text-decoration: none; color: black; }
diff --git a/webserver/nginx.conf b/webserver/nginx.conf
@@ -34,7 +34,7 @@ http {
     server {
         listen 80;
         listen 443 ssl;
-        server_name *.${CMBARTER_HOST};
+        server_name www.${CMBARTER_HOST};
         return 301 $scheme://${CMBARTER_HOST}$request_uri;
     }
 
