Skip to content

Commit

Permalink
Merge pull request #353 from dunglas/docs/license
Browse files Browse the repository at this point in the history
docs: add details about the license
  • Loading branch information
dunglas committed Jul 16, 2020
2 parents bac3aa3 + b909d6f commit dbc4fc4
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ a project may be further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at kevin+coc@dunglas.fr. All
reported by contacting the project team at contact+coc@mercure.rocks. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ In addition, a managed and high-scalability version of the Mercure.rocks hub is

See [CONTRIBUTING.md](CONTRIBUTING.md).

## License and Copyright

See https://mercure.rocks/docs/hub/license.

## Credits

Created by [K茅vin Dunglas](https://dunglas.fr). Graphic design by [Laury Sorriaux](https://github.com/ginifizz).
Expand Down
2 changes: 1 addition & 1 deletion docs/hub/cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ For more details (and a benchmark), [refer to the case study presented by the iG

### Purchasing

To purchase the On Premise version of the Mercure.rocks Hub, drop us a mail: [kevin+mercure@dunglas.fr](mailto:kevin+mercure@dunglas.fr?subject=I%27m%20interested%20in%20Mercure%20on%20premise)
To purchase the On Premise version of the Mercure.rocks Hub, drop us a mail: [contact@mercure.rocks](mailto:contact@mercure.rocks?subject=I%27m%20interested%20in%20Mercure%20on%20premise)

### Setting the License

Expand Down
14 changes: 14 additions & 0 deletions docs/hub/license.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
## License and Copyright

tl;dr:

* proprietary software **can** implement the Mercure specification
* proprietary publishers and subscribers **can** be used with the Mercure.rocks Hub without having to share their sources
* modifications made to the Mercure.rocks Hub **must** be shared
* alternatively, <a href="https://mercure.rocks/pricing">commercial licenses are available for the Mercure.rocks Hub</a>

[The specification](../../spec/mercure.md) is available under [the IETF copyright policy](https://trustee.ietf.org/copyright-faq.html). The Mercure **specification** can be implemented by any software, including proprietary software.

The Mercure.rocks Hub is licensed under [AGPL-3.0](https://github.com/dunglas/mercure/blob/master/LICENSE). This license implies that if you modify the Mercure.rocks Hub, you must share those modifications. However, the AGPL-3.0 license applies only to the hub server itself, **not to software using this hub**.

For companies not wanting, or not able to use AGPL-3.0 licensed software, commercial licenses are also available. [Contact us for more information](mailto:contact@mercure.rocks).
4 changes: 2 additions & 2 deletions spec/mercure.md
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery

# Implementation Status

[RFC Editor Note: Please remove this entire seciton prior to publication as an RFC.]
[RFC Editor Note: Please remove this entire section prior to publication as an RFC.]

This section records the status of known implementations of the protocol defined by this
specification at the time of posting of this Internet-Draft, and is based on a proposal described
Expand Down Expand Up @@ -900,7 +900,7 @@ Used in production.

Contact Information:

K茅vin Dunglas, [kevin+mercure@dunglas.fr](mailto:kevin+mercure@dunglas.fr) <https://mercure.rocks>
K茅vin Dunglas, [contact@mercure.rocks](mailto:contact@mercure.rocks) <https://mercure.rocks>

Interoperability:

Expand Down
2 changes: 1 addition & 1 deletion spec/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ info:
contact:
name: K茅vin Dunglas
url: https://mercure.rocks
email: kevin+mercure@dunglas.fr
email: contact@mercure.rocks
license:
name: GNU Affero General Public License v3.0 or later
url: https://github.com/dunglas/mercure/blob/master/LICENSE
Expand Down

0 comments on commit dbc4fc4

Please sign in to comment.