Some minor cosmetic tweaks:

* Syntax in SETUP.md
* Hide registration URL
* Correct home page footer
Signed-off-by: David Seaward <david.seaward@puri.sm>

SETUP.md

@@ -73,13 +73,16 @@ Setup
 
 * Copy sample config files to their respective locations:
 
-    ```
-    cp $VIRTUAL_ENV/config_sample/ldh_middleware/config.ini /etc/opt/purist/middleware/
-    cp $VIRTUAL_ENV/config_sample/ldh_middleware/secret.ini /etc/opt/purist/middleware/
-    cp $VIRTUAL_ENV/config_sample/ldh_middleware/link_profile.strict.yml /etc/opt/purist/middleware/
-    ```
+  ```
+  cp $VIRTUAL_ENV/config_sample/ldh_middleware/config.ini /etc/opt/purist/middleware/
+  cp $VIRTUAL_ENV/config_sample/ldh_middleware/secret.ini /etc/opt/purist/middleware/
+  cp $VIRTUAL_ENV/config_sample/ldh_middleware/link_profile.strict.yml /etc/opt/purist/middleware/
+  ```
+
     * Modify those files to fit your site needs. You will need to set `DEBUG_ALL_ACCESS=False` in config.ini if your OpenVPN is not fully configured. You can generate a good `DJANGO_SECRET_KEY` in secret.ini using the command `openssl rand -hex 48`.
+
 * Run initial setup:
+
     * `ldh_middleware collectstatic`
     * `ldh_middleware migrate`
     * Create the superuser. This requires a working LDAP configuration/environment. You can get a basic LDAP server running following [these](https://source.puri.sm/liberty/ldh_developer/wikis/ldap/install#ldap-manual-installation) instructions. Once you have a working LDAP server you can run:
@@ -145,10 +148,10 @@ Other setup guides
 
 There are other setup guides available here:
 
-* Setup LDH/Keel locally from source for development:
-  * https://source.puri.sm/liberty/ldh_developer/wikis/ldh_middleware/from-source
-* Setup LDH/Keel on other host using Debian package:
-  * https://source.puri.sm/liberty/ldh_developer/wikis/ldh_middleware/install
+* Setup Keel locally from source for development:  
+  <https://source.puri.sm/liberty/ldh_developer/wikis/ldh_middleware/from-source>
+* Setup Keel on other host using Debian package:  
+  <https://source.puri.sm/liberty/ldh_developer/wikis/ldh_middleware/install>
 
 Configure
 ---------

ldapregister/templates/base.html

@@ -38,8 +38,11 @@ SPDX-License-Identifier: AGPL-3.0
         <a href="{% url 'auth_logout' %}">{% trans "Log out" %}</a>
         {% else %}
         {% trans "You are not logged in." %}<br/>
-        <a href="{% url 'auth_login' %}">{% trans "Log in" %}</a> {% trans "or" %}
+        <a href="{% url 'auth_login' %}">{% trans "Log in" %}</a>
+        <!--
+        {% trans "or" %}
         <a href="{% url 'registration_register' %}">{% trans "register" %}</a>
+        -->
         {% endif %}
     </div>
 

limitmonitor/jinja2/limitmonitor/userlimit.html

@@ -42,8 +42,11 @@ SPDX-License-Identifier: AGPL-3.0
         <a href="{% url 'auth_logout' %}">{% trans "Log out" %}</a>
         {% else %}
         {% trans "You are not logged in." %}<br/>
-        <a href="{% url 'auth_login' %}">{% trans "Log in" %}</a> {% trans "or" %}
+        <a href="{% url 'auth_login' %}">{% trans "Log in" %}</a>
+        <!--
+        {% trans "or" %}
         <a href="{% url 'registration_register' %}">{% trans "register." %}</a>
+        -->
         {% endif %}
     </div>
 

middleware/urls.py

@@ -42,7 +42,7 @@ urlpatterns = [
     url(r'^accounts/profile/purist.ovpn', limitmonitor.views.ovpn_userfile, name='ovpn_userfile'),
     url(r'^accounts/profile/toggle_tunnel',
         limitmonitor.views.toggle_tunnel, name='toggle_tunnel'),
-    url(r'^accounts/register/$', RegistrationView.as_view(form_class=RegistrationForm), name='registration_register'),
+    # url(r'^accounts/register/$', RegistrationView.as_view(form_class=RegistrationForm), name='registration_register'),
     url(r'^accounts/', include('registration.backends.simple.urls')),
     url(r'^download/', include('django_agpl.urls')),
     url(r'^jslicense/$', purist.views.jslicense, name='jslicense'),

purist/jinja2/purist/home.html

@@ -41,9 +41,11 @@ SPDX-License-Identifier: AGPL-3.0
         <a href="{% url 'auth_logout' %}">{% trans "Log out" %}</a>
         {% else %}
         {% trans "You are not logged in." %}<br/>
-        <a href="{% url 'auth_login' %}">{% trans "Log in" %}</a> {% trans "or" %}
+        <a href="{% url 'auth_login' %}">{% trans "Log in" %}</a>
+        <!--
+        {% trans "or" %}
         <a href="{% url 'registration_register' %}">{% trans "register." %}</a>
-        {% endif %}
+        -->        {% endif %}
     </div>
 
 </header>
@@ -62,7 +64,7 @@ SPDX-License-Identifier: AGPL-3.0
 
         <p>
             <em>{{ site_title }}</em> provided by <a href="{{ site_provider_link }}">{{ site_provider }}</a><br/>
-            <em>Keel (LDH middleware)</em> copyright 2017-2018 Purism SPC; shared under AGPL-3.0-or-later
+            Code shared under AGPL-3.0-or-later
             (<a href="https://source.puri.sm/liberty/ldh_middleware">project</a>,
             <a href="{% url 'download-zip' %}">source</a>,
             <a href="{% url 'jslicense' %}" rel="jslicense">javascript</a>)