Commit f5a0df5a authored by David Seaward's avatar David Seaward

minor udpates

* update to Django 1.11.5
* explicitly list all dependencies so we can `pip install --no-deps`
* layout and config fixes from deployment tests
parent 58a28b67
......@@ -33,6 +33,7 @@ Prerequisites
* `libssl-dev`
* `python3-dev`
* `supervisor`
* `virtualenv`
* Additional uWSGI packages:
* `uwsgi`
* `uwsgi-emperor`
......
......@@ -38,19 +38,10 @@ SPDX-License-Identifier: CC-BY-SA-4.0
<p>{{ site_byline }}</p>
<p>
<a href="https://plan.puri.st">plan</a> | <a href="https://code.puri.sm/purist">code</a> |
<strong>test</strong> | <a href="https://puri.st">deliver</a>
</p>
<p style="font-size: small">
Services provided by <a href="https://puri.sm">Purism SPC</a>. Stand-in logo from
<a href="https://plan.puri.st/project/overview/design/logo">Openclipart</a> [CC0].
</p>
<p style="font-size: small">
Purist services middleware. Copyright 2016 Purism SPC and contributors. Shared under AGPL-3.0+
<a href="{% url 'download-zip' %}">Download source</a>
Services provided by <a href="https://puri.sm">Purism SPC</a><br/>
Middleware copyright 2017 Purism SPC and contributors. Shared under AGPL-3.0+
(<a href="https://plan.puri.st">project</a>, <a href="{% url 'download-zip' %}">source</a>)
</p>
</body>
......
{% extends "base.html" %}
{% load i18n %}
{% load crispy_forms_tags %}
{% block title %}{% trans 'Registration closed' %}{% endblock %}
{% block header %}{% trans 'Registration closed' %}{% endblock %}
{% block byline %}{% trans 'Services are not yet available' %}{% endblock %}
{% block content %}
{% endblock %}
import ldap
from decouple import Config, Csv, RepositoryIni
from django_auth_ldap.config import LDAPSearch
import django_agpl
from .settings_original import *
......@@ -9,8 +8,8 @@ from .settings_original import *
# LOAD CONFIGURATION FILE
#
CONFIG_PATH = '/etc/opt/purist/account/config.ini'
SECRET_PATH = '/etc/opt/purist/account/secret.ini'
CONFIG_PATH = '/etc/opt/purist/middleware/config.ini'
SECRET_PATH = '/etc/opt/purist/middleware/secret.ini'
config = Config(RepositoryIni(CONFIG_PATH))
secret_config = Config(RepositoryIni(SECRET_PATH))
......
amqp==2.2.2
asn1crypto==0.22.0
bcrypt==3.1.3
billiard==3.5.0.3
certifi==2017.7.27.1
cffi==1.11.0
chardet==3.0.4
cryptography==2.0.3
django-agpl==4.0.0
idna==2.6
kombu==4.1.0
MarkupSafe==1.0
ordereddict==1.1
pycparser==2.18
pyldap==2.4.37
PyNaCl==1.1.2
pytz==2017.2
requests==2.18.4
six==1.11.0
urllib3==1.22
vine==1.1.4
-r requirements.txt
Sphinx==1.6.2
alabaster==0.7.10
Babel==2.5.1
certifi==2017.7.27.1
chardet==3.0.4
docutils==0.14
idna==2.6
imagesize==0.7.1
Jinja2==2.9.6
MarkupSafe==1.0
Pygments==2.2.0
pytz==2017.2
requests==2.18.4
six==1.11.0
snowballstemmer==1.2.1
Sphinx==1.6.3
sphinxcontrib-websupport==1.0.1
urllib3==1.22
Django==1.11.4
Jinja2==2.9.6
WooCommerce==1.2.1
-r dependencies.txt
celery==4.0.2
dj-database-url==0.4.2
django-auth-ldap==1.2.13
Django==1.11.5
django-agpl==4.0.0
django-auth-ldap==1.2.13
django-celery-beat==1.0.1
django-crispy-forms==1.6.1
django-ldapdb==0.9.0
django-registration==2.2
Jinja2==2.9.6
jinja2-django-tags==0.5
paramiko==2.2.1
pyasn1==0.2.3
python-decouple==3.0
WooCommerce==1.2.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment