2022-12-02 11:06:10 +01:00
|
|
|
# Contribute
|
2019-09-26 03:05:49 +02:00
|
|
|
|
2019-10-01 12:59:39 +02:00
|
|
|
If you feel like contributing there are a couple of ways to do this
|
2019-09-26 03:05:49 +02:00
|
|
|
|
2021-10-05 16:13:42 +02:00
|
|
|
### Adding a new domain
|
|
|
|
The workflow is a bit clumsy, but the most reliable and fail-safe.
|
|
|
|
1. You add an issue with you question, feature request or contribution
|
2023-11-28 04:40:27 +01:00
|
|
|
via [Issue templates](https://github.com/mypdns/matrix#issue-templates-quick-links)
|
2021-10-05 16:13:42 +02:00
|
|
|
(This is the history of _why_ to blacklist a record)
|
|
|
|
|
|
|
|
ALL fields MOST be filled out, the questions is there for a
|
|
|
|
good reason...
|
|
|
|
|
|
|
|
2. Add your new domain record(s) to suitable file(s) in the `submit_here/`
|
|
|
|
folder.
|
2022-12-02 11:06:10 +01:00
|
|
|
An issue is required to be able to historically trace why you
|
2021-10-05 16:13:42 +02:00
|
|
|
have committed the records and for other to verify your commit
|
2022-01-31 13:13:48 +01:00
|
|
|
without having to visit a pornographic site, for which they actually
|
2021-10-05 16:13:42 +02:00
|
|
|
try to avoid by using this list.
|
|
|
|
|
2022-01-31 13:13:48 +01:00
|
|
|
3. If you added any content to any of the files in `submit_here/`
|
2023-11-28 04:40:27 +01:00
|
|
|
You open an [MR][MR] (Merge Request) where you'll
|
2022-01-31 13:13:48 +01:00
|
|
|
add your contribution (This is the _when_ we did the blacklisting)
|
2021-10-05 16:13:42 +02:00
|
|
|
|
|
|
|
4. You add the new domain record entry in the top or bottom of the list,
|
|
|
|
then it is easier to find.
|
2022-01-31 13:13:48 +01:00
|
|
|
The CI/CD code will sort it in alphanumeric order
|
2021-10-05 16:13:42 +02:00
|
|
|
|
|
|
|
5. Follow the [New commit](#new-commit) guide
|
|
|
|
|
2022-01-31 13:13:48 +01:00
|
|
|
## Manage sub-domain in existing issue domains
|
|
|
|
Add then in same style and with the usual minimum of need data in a
|
|
|
|
comment to the primary domain, then if the report is confirmed, it will
|
|
|
|
be edited into the original issue.
|
|
|
|
|
2022-12-02 11:06:10 +01:00
|
|
|
Each individual subdomain should have its own "master" comment.
|
2022-01-31 13:13:48 +01:00
|
|
|
|
2022-12-02 11:06:10 +01:00
|
|
|
In that way you can challenge/comment to each subdomain as things will
|
2022-01-31 13:13:48 +01:00
|
|
|
change over time.
|
|
|
|
|
2023-11-28 04:40:27 +01:00
|
|
|
As practised here: https://github.com/mypdns/matrix/issues/201
|
2022-01-31 13:13:48 +01:00
|
|
|
|
|
|
|
<details><summary>Click to expand</summary>
|
|
|
|
|
2023-11-28 04:40:27 +01:00
|
|
|
![Manage sub-domains]()
|
2022-01-31 13:13:48 +01:00
|
|
|
|
|
|
|
</details>
|
2019-09-26 03:05:49 +02:00
|
|
|
|
|
|
|
|
2020-01-16 04:16:10 +01:00
|
|
|
## Why first issue then MR?
|
2022-01-15 14:03:12 +01:00
|
|
|
The simplest idea is often the most safe, and this is the very reason for this
|
2019-10-01 12:59:39 +02:00
|
|
|
workflow. It is also giving the project a searchable database for added domains
|
2022-01-15 14:03:12 +01:00
|
|
|
and the comment, by which we can't add in other ways, as all the lists needs to
|
|
|
|
be raw data; from which other scripts easily can work with, without first have
|
2020-01-16 04:16:10 +01:00
|
|
|
to run several cleanup processes.
|
2019-09-26 03:05:49 +02:00
|
|
|
|
2023-11-28 04:40:27 +01:00
|
|
|
Please also read our [Writing Guide](https://kb.mypdns.org/articles/MTX/contributing/Writing-Guide) before continuing with your issue contribution
|
2021-09-12 01:05:05 +02:00
|
|
|
|
2019-10-01 12:59:39 +02:00
|
|
|
# GPG signed
|
|
|
|
We require all submissions to be signed with a valid GPG key.
|
|
|
|
|
2022-12-02 11:06:10 +01:00
|
|
|
Only exception to this rule is the CI/CD bot
|
2019-10-01 12:59:39 +02:00
|
|
|
|
|
|
|
## How do I sign with GPG
|
2022-01-15 14:03:12 +01:00
|
|
|
If you know nothing about GPG keys I, really suggest you search on
|
2022-12-02 11:06:10 +01:00
|
|
|
[duckduckgo.com][DDG] for the best way, to do it for the OS you
|
2019-10-01 12:59:39 +02:00
|
|
|
are using.
|
|
|
|
|
2022-12-02 11:06:10 +01:00
|
|
|
However, if you do have a GPG key, add it to you submission profile and add a `-S`
|
|
|
|
to `git commit -S -m "Some very cool enhancements"` and that is. You can also
|
|
|
|
set this globally or pr git. Do a search on [duckduckgo.com][DDG]
|
2019-10-01 12:59:39 +02:00
|
|
|
to figure out the current way.
|
|
|
|
|
|
|
|
# Writing files/lines
|
2020-01-16 04:16:10 +01:00
|
|
|
- All files most end with a newline `\n` (LF) UTF-8.
|
2019-10-01 12:59:39 +02:00
|
|
|
- All files have to be in universal UTF-8 style without BOM
|
2022-12-02 11:06:10 +01:00
|
|
|
- Files containing `_windows_` in its filename most be encoded in `ISO-8859-1`
|
2020-01-16 04:16:10 +01:00
|
|
|
Latin1 and newlines shall end in (CRLF).
|
|
|
|
- Line length should not be more than 80 chars for terminals support.
|
2022-08-09 17:20:52 +02:00
|
|
|
|
|
|
|
--------------------
|
|
|
|
|
|
|
|
# Adult contents contribution
|
|
|
|
|
|
|
|
# Contributing
|
|
|
|
|
|
|
|
If you feel like contributing there are a couple of ways to do this
|
|
|
|
|
|
|
|
1. You can add new super high-speed code, optimizing existing code
|
|
|
|
or rewrite for broader support of bash environments across *nix
|
|
|
|
OS's
|
|
|
|
|
2022-12-02 11:06:10 +01:00
|
|
|
2. You should **_not_** add domains to the `submit_here/` folder of
|
2022-08-09 17:20:52 +02:00
|
|
|
this repo. It has to be committed via an ISSUE.
|
|
|
|
|
|
|
|
Because I do have some scripts that handle/maintains several things
|
|
|
|
each time an issue is confirmed, like the DNS RPZ zone and the
|
|
|
|
repository at once.
|
|
|
|
|
|
|
|
# Submit - Contribute
|
|
|
|
|
|
|
|
## Workflow
|
|
|
|
|
|
|
|
## Add new domains
|
|
|
|
This one is too simple or therefore probably too good to be
|
|
|
|
true... right?
|
|
|
|
|
|
|
|
Nope, it is true. How can you contribute to 4 Blacklist with
|
|
|
|
one issue + several RPZ Zone?
|
|
|
|
|
|
|
|
1. You open an issue from the list above
|
|
|
|
|
|
|
|
### Issue comment
|
|
|
|
you should know a couple of things about the issue templates,
|
|
|
|
as I know a lot of people hates them as I suspect they don't
|
|
|
|
understand the long-term and bigger idea behind them.
|
|
|
|
|
|
|
|
Hopefully, the following text might help with that.
|
|
|
|
- It is 1 domain = 1 issue
|
|
|
|
- The templates are designed so nobody should have to visit any of the
|
|
|
|
domains to verify, it is a pornographic domain, hence why the small
|
|
|
|
screenshots of the site are required.
|
|
|
|
- Everything should, at best, be designed to help others in their goal
|
|
|
|
for maintaining and blacklisting adult-related material.
|
|
|
|
- We shall always do our best to achieve this so that no one has to
|
|
|
|
visit a pornographic site to verify it, once the team behind the
|
|
|
|
project has done this.
|
|
|
|
- They are designed to match another project (Long term), currently known
|
|
|
|
as the matrix, yes because of a $2 domain while watching the matrix
|
2023-11-28 04:40:27 +01:00
|
|
|
movie. https://github.com/mypdns/mypdns.org/README.md
|
2022-08-09 17:20:52 +02:00
|
|
|
|
|
|
|
2. @spirillen will handle these regularly basis, which usual
|
|
|
|
would be a couple of times a week.
|
|
|
|
|
|
|
|
**IMPORTANT**: Fill out any fields, or you will at first be requested to
|
|
|
|
add missing values, if you fail to do this, your commitment can in sever
|
|
|
|
cases end up being deleted.
|
|
|
|
|
|
|
|
## Manage sub-domain in existing issue domains
|
|
|
|
Add then in the same style and with the usual minimum of need data in a
|
|
|
|
comment to the primary domain, then if the report is confirmed, it will
|
|
|
|
be edited into the original issue.
|
|
|
|
|
|
|
|
Each subdomain should have its own "master" comment.
|
|
|
|
|
2022-12-02 11:06:10 +01:00
|
|
|
In that way, you can challenge/comment to each subdomain as things will
|
2022-08-09 17:20:52 +02:00
|
|
|
change over time.
|
|
|
|
|
2023-11-28 04:40:27 +01:00
|
|
|
As practiced here: https://github.com/mypdns/matrix/issues/201
|
2022-08-09 17:20:52 +02:00
|
|
|
|
|
|
|
<details><summary>Click to expand</summary>
|
|
|
|
|
2023-11-28 04:40:27 +01:00
|
|
|
![Manage sub-domains]()
|
2022-08-09 17:20:52 +02:00
|
|
|
|
|
|
|
</details>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## Screenshot
|
|
|
|
Why @spirillen is so picky about the screenshots is due to the time
|
|
|
|
available for him to handle this. You should also have read this
|
|
|
|
[comment](#issue-comment)
|
|
|
|
|
|
|
|
We prefer you upload your fresh screenshot directly to us, as
|
2022-12-02 11:06:10 +01:00
|
|
|
hot-linking screenshots is bad in most ways, such as 3rd party tracking
|
2022-08-09 17:20:52 +02:00
|
|
|
and other user data collection and tracking cookies. Minimize the number
|
|
|
|
of hotlinks used, it's not forbidden as long this won't be abused.
|
|
|
|
There are also cases where people simply block all 3rd party contents,
|
2022-12-02 11:06:10 +01:00
|
|
|
they are not able to see any hot-linked contents.
|
2022-08-09 17:20:52 +02:00
|
|
|
|
|
|
|
### New code
|
|
|
|
If you feel like adding new code or modifying existing code to make it run
|
|
|
|
better, faster, smarter, etc. You will be editing and contributing to the
|
|
|
|
code, automatically be redirected to a fork of the main repo, from where
|
|
|
|
you add and/or modify the code.
|
|
|
|
|
|
|
|
When you are done with your contribution, you will save the file in
|
|
|
|
a new branch. Don't forget to make a full reference to the issue in
|
|
|
|
your commit message as a full URL to issue:
|
|
|
|
|
|
|
|
```md
|
2023-11-28 04:40:27 +01:00
|
|
|
https://github.com/mypdns/matrix/issues<ID>
|
2022-08-09 17:20:52 +02:00
|
|
|
```
|
|
|
|
|
|
|
|
Replace the `<ID>` with the issue id from
|
2023-11-28 04:40:27 +01:00
|
|
|
https://github.com/mypdns/matrix/issues
|
2022-08-09 17:20:52 +02:00
|
|
|
|
|
|
|
![new commit](https://user-images.githubusercontent.com/44526987/134584727-5ce2cc04-6eac-485d-a934-1b730cb1fe44.png)
|
|
|
|
|
|
|
|
Next you'll be taken to the `Open a pull request`
|
|
|
|
|
|
|
|
![Open a pull request](https://user-images.githubusercontent.com/44526987/134584048-51c583f1-8fe8-4536-831d-8b821077fe57.png)
|
|
|
|
|
|
|
|
When everything is filled out correctly, you just hit the
|
|
|
|
`Create pull request` and you are done.
|
|
|
|
|
|
|
|
|
|
|
|
## GPG signed
|
|
|
|
We require all submissions to be signed with a valid GPG key.
|
|
|
|
|
|
|
|
The only exception to this rule is the CI/CD bot.
|
|
|
|
|
|
|
|
### How to sign with GPG
|
|
|
|
If you know nothing about GPG keys I suggest you search on
|
|
|
|
[duckduckgo][duckduckgo] for the best way to do it, on your
|
|
|
|
current OS.
|
|
|
|
|
|
|
|
However, if you do have a GPG key, add it to your submission profile add a
|
2022-12-02 11:06:10 +01:00
|
|
|
`-S` to the `git commit -S -m "Some very cool enhancements"` and that
|
2022-08-09 17:20:52 +02:00
|
|
|
is. You can set this globally or pr git. Search [duckduckgo][duckduckgo] to figure out the current way.
|
|
|
|
|
|
|
|
### Encoding when writing files/lines
|
|
|
|
- All files must end with a newline `\n`(LF) UTF-8.
|
|
|
|
- All files have to be in universal UTF-8 style without BOM
|
|
|
|
- Any files or file location containing `_windows_` in its files must
|
|
|
|
be encoded in `ISO-8859-1 Latin1` and newlines *most* end in (CRLF)
|
|
|
|
- Line length should not be any longer than 80 chars for supporting
|
|
|
|
terminals.
|
|
|
|
|
|
|
|
|
2023-11-28 04:40:27 +01:00
|
|
|
[//]: # Document links
|
|
|
|
|
2022-12-02 11:06:10 +01:00
|
|
|
[DDG]: https://duckduckgo.com
|
2023-11-28 04:40:27 +01:00
|
|
|
[PR]: https://github.com/mypdns/matrix/tree/master/source/porn_filters
|
2022-08-09 17:20:52 +02:00
|
|
|
[duckduckgo]: https://safe.duckduckgo.com
|
2022-12-02 11:06:10 +01:00
|
|
|
[akismet]: https://akismet.com/ "Akismet stops spam."
|
2022-08-09 17:20:52 +02:00
|
|
|
|
|
|
|
|
2023-11-28 04:40:27 +01:00
|
|
|
This version supersedes <https://kb.mypdns.org/articles/MTX/Contributing>
|
2022-08-09 17:20:52 +02:00
|
|
|
|
2023-11-28 04:40:27 +01:00
|
|
|
Revision date: 28. Nov 2023.
|
2022-08-09 17:20:52 +02:00
|
|
|
|
2023-11-28 04:54:07 +01:00
|
|
|
Last edited by: <https://kb.mypdns.org/users/spirillen/>
|
2022-08-09 17:20:52 +02:00
|
|
|
|
2023-11-28 04:40:27 +01:00
|
|
|
Approved by: <https://kb.mypdns.org/users/spirillen>
|
|
|
|
|
|
|
|
Version: rPD 1.3
|
2022-08-09 17:20:52 +02:00
|
|
|
|
2023-11-28 04:40:27 +01:00
|
|
|
[MR]: https://github.com/mypdns/matrix/compare
|