Commit fe5a1329 authored by David Seaward's avatar David Seaward

update project name, links, SPDX identifier, add DCO text

Signed-off-by: David Seaward's avatarDavid Seaward <david.seaward@puri.sm>
parent d4498772
Developer Certificate of Origin
Version 1.1
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or
(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.
(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.
# Copying notice
Services middleware <br />
<https://source.puri.sm/purist/middleware> <br />
Copyright 2017-2018 Purism SPC <br />
SPDX-License-Identifier: AGPL-3.0+
Keel - PSH Middleware
<https://source.puri.sm/liberty/psh_middleware>
Copyright 2017-2018 Purism SPC
SPDX-License-Identifier: AGPL-3.0-or-later
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
......
Services middleware
===================
Keel - PSH Middleware
=====================
[project] | [code] | [tracker] | *snippets*
[project] | [code] | [tracker]
A middleware application for managing private, account-based services,
including resource management and user-facing registration. Tailored for
*Purist services* as offered by Purism SPC, but ready to be modified and
deployed anywhere, by anyone.
A Django-based middleware application (with a user-facing web interface) for managing services, resources and
subscription-based accounts on a Purist Services Host (PSH). Tailored for services operated by Purism SPC, but ready to
be modified and deployed anywhere, by anyone.
Installation
------------
......@@ -40,29 +39,29 @@ Model diagram generated with:
Sharing and contributions
-------------------------
Services middleware
<https://source.puri.sm/purist/middleware>
Keel - PSH Middleware
<https://source.puri.sm/liberty/psh_middleware>
Copyright 2017-2018 Purism SPC
SPDX-License-Identifier: AGPL-3.0+
SPDX-License-Identifier: AGPL-3.0-or-later
Shared under AGPLv3-or-later. We adhere to the Contributor Covenant 1.4
without modification. Signed contributions (`git commit -s`) under the
same terms are welcome.
Shared under AGPL-3.0-or-later. We adhere to the Contributor Covenant
1.4 without modification, and certify origin per DCO 1.1 with a
signed-off-by line. Contributions under the same terms are welcome.
For details see:
* [COPYING.md], license notices
* [COPYING.AGPL.md], full license text
* [COPYING.md], additional license notices
* [CODE_OF_CONDUCT.md], full conduct text
* [CONTRIBUTING.DCO.md], full contribution text
* [CONTRIBUTING.md], additional contribution notes
* [CONTRIBUTING.DCO.md], full origin text
<!-- * [CONTRIBUTING.md], additional contribution notes -->
<!-- Links -->
[project]: https://source.puri.sm/purist/middleware
[code]: https://source.puri.sm/purist/middleware
[tracker]: https://source.puri.sm/purist/middleware/issues
[snippets]: https://code.puri.sm/purist/snippets/src/master/middleware
[project]: https://source.puri.sm/liberty/psh_middleware
[code]: https://source.puri.sm/liberty/psh_middleware/tree/master
[tracker]: https://source.puri.sm/liberty/psh_middleware/issues
[SETUP.md]: SETUP.md
[COPYING.AGPL.md]: COPYING.AGPL.md
[CODE_OF_CONDUCT.md]: CODE_OF_CONDUCT.md
......
......@@ -26,7 +26,7 @@ Prerequisites
* [WooCommerce Subscriptions](https://woocommerce.com/products/woocommerce-subscriptions/)
* [JWT Authentication for WP REST API](https://wordpress.org/plugins/jwt-authentication-for-wp-rest-api/)
* OpenVPN instance (SSH access)
* Including [openvpn-confgen](https://code.puri.sm/purist/openvpn_confgen)
* Including [openvpn-confgen](https://code.puri.sm/liberty/openvpn_confgen)
* Typically, the Nginx user (`www-data`) will need SSH access
* Test with `sudo -u www-data ssh -p PORT REMOTE_USER@HOSTNAME`
* The user needing access can be changed in
......
; stored as /etc/supervisor/conf.d/purist_middleware_monitor.conf
; Copyright 2017-2018 Purism SPC
; SPDX-License-Identifier: AGPL-3.0+
; SPDX-License-Identifier: AGPL-3.0-or-later
; Adapted from extra/supervisord/celerybeat.conf in Celery
; Copyright 2012-2014 GoPivotal, Inc.
......
......@@ -56,7 +56,7 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
project = 'Services middleware'
project = 'Keel - PSH Middleware'
copyright = '2017-2018 Purism SPC'
author = 'Purism SPC'
......
......@@ -3,7 +3,7 @@
<!--
Copyright 2017-2018 Purism SPC
https://source.puri.sm/purist/middleware
https://source.puri.sm/liberty/psh_middleware
SPDX-License-Identifier: AGPL-3.0
-->
......@@ -59,8 +59,8 @@ SPDX-License-Identifier: AGPL-3.0
<p>
<em>Purist services</em> provided by <a href="https://puri.sm">Purism SPC</a><br/>
<em>Services middleware</em> copyright 2017-2018 Purism SPC; shared under AGPL-3.0+
(<a href="https://source.puri.sm/purist/middleware">project</a>,
<em>Keel - PSH Middleware</em> copyright 2017-2018 Purism SPC; shared under AGPL-3.0-or-later
(<a href="https://source.puri.sm/liberty/psh_middleware">project</a>,
<a href="{% url 'download-zip' %}">source</a>,
<a href="{% url 'jslicense' %}" rel="jslicense">javascript</a>)
</p>
......
<!DOCTYPE html>
<!--
Keel - PSH Middleware
Copyright 2017-2018 Purism SPC
https://source.puri.sm/purist/middleware
https://source.puri.sm/liberty/psh_middleware
SPDX-License-Identifier: AGPL-3.0
-->
......@@ -85,7 +86,7 @@ SPDX-License-Identifier: AGPL-3.0
<ul>
{% if has_limit["TUNNEL"] %}
<li><a href="{% url 'ovpn_userfile' %}">{% trans "Tunnel certificate" %}</a></li>
<li><a href="https://source.puri.sm/purist/services/wikis/tunnel-desktop" target="_blank">{% trans "Tunnel
<li><a href="https://source.puri.sm/liberty/services/wikis/tunnel-desktop" target="_blank">{% trans "Tunnel
setup instructions"
%}</a>
</li>
......@@ -131,8 +132,8 @@ SPDX-License-Identifier: AGPL-3.0
<p>
<em>{{ site_title }}</em> provided by <a href="{{ site_provider_link }}">{{ site_provider }}</a><br/>
<em>Services middleware</em> copyright 2017-2018 Purism SPC; shared under AGPL-3.0+
(<a href="https://source.puri.sm/purist/middleware">project</a>,
<em>Keel - PSH Middleware</em> copyright 2017-2018 Purism SPC; shared under AGPL-3.0-or-later
(<a href="https://source.puri.sm/liberty/psh_middleware">project</a>,
<a href="{% url 'download-zip' %}">source</a>,
<a href="{% url 'jslicense' %}" rel="jslicense">javascript</a>)
</p>
......
# Copyright 2017-2018 Purism SPC
# SPDX-License-Identifier: AGPL-3.0+
# SPDX-License-Identifier: AGPL-3.0-or-later
# Original file from Celery 4.0.2 documentation
# Copyright 2009-2016 Ask Solem
......
......@@ -2,7 +2,7 @@
<!--
Copyright 2017-2018 Purism SPC
https://source.puri.sm/purist/middleware
https://source.puri.sm/liberty/psh_middleware
SPDX-License-Identifier: AGPL-3.0
-->
......@@ -61,8 +61,8 @@ SPDX-License-Identifier: AGPL-3.0
<p>
<em>{{ site_title }}</em> provided by <a href="{{ site_provider_link }}">{{ site_provider }}</a><br/>
<em>Services middleware</em> copyright 2017-2018 Purism SPC; shared under AGPL-3.0+
(<a href="https://source.puri.sm/purist/middleware">project</a>,
<em>Keel - PSH Middleware</em> copyright 2017-2018 Purism SPC; shared under AGPL-3.0-or-later
(<a href="https://source.puri.sm/liberty/psh_middleware">project</a>,
<a href="{% url 'download-zip' %}">source</a>,
<a href="{% url 'jslicense' %}" rel="jslicense">javascript</a>)
</p>
......
......@@ -2,7 +2,7 @@
<!--
Copyright 2017-2018 Purism SPC
https://source.puri.sm/purist/middleware
https://source.puri.sm/liberty/psh_middleware
SPDX-License-Identifier: AGPL-3.0
-->
......@@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0
</h1>
<p>
No licenses. <em>Services middleware</em> does not require JavaScript, minified or otherwise, at this time.
No licenses. <em>Keel - PSH Middleware</em> does not require JavaScript, minified or otherwise, at this time.
</p>
<table id="jslicense-labels1">
......
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