From ab80c8ebb85271e9b5456c36316b7ebc98d96f1e Mon Sep 17 00:00:00 2001 From: Michael Loftis Date: Wed, 6 Feb 2019 17:54:30 +0000 Subject: adds a couple of explicit examples for ExSyslogger --- docs/config.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'docs') diff --git a/docs/config.md b/docs/config.md index e042d216f..ba6807760 100644 --- a/docs/config.md +++ b/docs/config.md @@ -100,6 +100,26 @@ config :pleroma, Pleroma.Mailer, ## :logger * `backends`: `:console` is used to send logs to stdout, `{ExSyslogger, :ex_syslogger}` to log to syslog + +An example to enable ONLY ExSyslogger (f/ex in ``prod.secret.exs``) with info and debug suppressed: +``` +config :logger, + backends: [{ExSyslogger, :ex_syslogger}] + +config :logger, :ex_syslogger, + level: :warn +``` + +Another example, keeping console output and adding the pid to syslog output: +``` +config :logger, + backends: [:console, {ExSyslogger, :ex_syslogger}] + +config :logger, :ex_syslogger, + level: :warn, + option: [:pid, :ndelay] +``` + See: [logger’s documentation](https://hexdocs.pm/logger/Logger.html) and [ex_syslogger’s documentation](https://hexdocs.pm/ex_syslogger/) -- cgit v1.2.3 From 46aa8c18a211034bc102cfffec61c9cc8c3cdf02 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Fri, 8 Feb 2019 12:38:24 +0300 Subject: Add keyword policy --- docs/config.md | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs') diff --git a/docs/config.md b/docs/config.md index e042d216f..55d618925 100644 --- a/docs/config.md +++ b/docs/config.md @@ -151,6 +151,11 @@ This section is used to configure Pleroma-FE, unless ``:managed_config`` in ``:i * `delist_threshold`: Number of mentioned users after which the message gets delisted (the message can still be seen, but it will not show up in public timelines and mentioned users won't get notifications about it). Set to 0 to disable. * `reject_threshold`: Number of mentioned users after which the messaged gets rejected. Set to 0 to disable. +## :mrf_keyword +* `reject`: A list of patterns which result in message being rejected, each pattern can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) +* `ftl_removal`: A list of patterns which result in message being removed from federated timelines(a.k.a unlisted), each pattern can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) +* `replace`: A list of tuples containing `{pattern, replacement`, `pattern` can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) + ## :media_proxy * `enabled`: Enables proxying of remote media to the instance’s proxy * `base_url`: The base URL to access a user-uploaded file. Useful when you want to proxy the media files via another host/CDN fronts. -- cgit v1.2.3 From 8a0b755c19ef9c896f69de2b1bf22418a3aedf6f Mon Sep 17 00:00:00 2001 From: rinpatch Date: Fri, 8 Feb 2019 13:12:09 +0300 Subject: rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy --- docs/config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/config.md b/docs/config.md index 55d618925..c0eb4ceb4 100644 --- a/docs/config.md +++ b/docs/config.md @@ -153,7 +153,7 @@ This section is used to configure Pleroma-FE, unless ``:managed_config`` in ``:i ## :mrf_keyword * `reject`: A list of patterns which result in message being rejected, each pattern can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) -* `ftl_removal`: A list of patterns which result in message being removed from federated timelines(a.k.a unlisted), each pattern can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) +* `federated_timeline_removal`: A list of patterns which result in message being removed from federated timelines(a.k.a unlisted), each pattern can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) * `replace`: A list of tuples containing `{pattern, replacement`, `pattern` can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) ## :media_proxy -- cgit v1.2.3 From 38ff9b3568c637bd69a4bdadbdeb147d7871b09a Mon Sep 17 00:00:00 2001 From: rinpatch Date: Fri, 8 Feb 2019 15:12:44 +0300 Subject: fix typo in config.md --- docs/config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/config.md b/docs/config.md index 08523ac53..89393449c 100644 --- a/docs/config.md +++ b/docs/config.md @@ -173,7 +173,7 @@ This section is used to configure Pleroma-FE, unless ``:managed_config`` in ``:i ## :mrf_keyword * `reject`: A list of patterns which result in message being rejected, each pattern can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) -* `federated_timeline_removal`: A list of patterns which result in message being removed from federated timelines(a.k.a unlisted), each pattern can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) +* `federated_timeline_removal`: A list of patterns which result in message being removed from federated timelines (a.k.a unlisted), each pattern can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) * `replace`: A list of tuples containing `{pattern, replacement`, `pattern` can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) ## :media_proxy -- cgit v1.2.3 From 9a23f8f3ea9e788978055f0ad3a10db105f68cc6 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Fri, 8 Feb 2019 20:23:26 +0300 Subject: Add tests and fix a typo in docs --- docs/config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/config.md b/docs/config.md index 89393449c..74badd0da 100644 --- a/docs/config.md +++ b/docs/config.md @@ -174,7 +174,7 @@ This section is used to configure Pleroma-FE, unless ``:managed_config`` in ``:i ## :mrf_keyword * `reject`: A list of patterns which result in message being rejected, each pattern can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) * `federated_timeline_removal`: A list of patterns which result in message being removed from federated timelines (a.k.a unlisted), each pattern can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) -* `replace`: A list of tuples containing `{pattern, replacement`, `pattern` can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) +* `replace`: A list of tuples containing `{pattern, replacement}`, `pattern` can be a string or a [regular expression](https://hexdocs.pm/elixir/Regex.html) ## :media_proxy * `enabled`: Enables proxying of remote media to the instance’s proxy -- cgit v1.2.3 From d0cf58d0320b26eca4d274f54f6b12176c3cd38b Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 28 Jan 2019 05:50:08 +0100 Subject: WIP: docs/Clients.md: Add documentation about clients supporting pleroma [ci skip] --- docs/Clients.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 docs/Clients.md (limited to 'docs') diff --git a/docs/Clients.md b/docs/Clients.md new file mode 100644 index 000000000..f90f82bfe --- /dev/null +++ b/docs/Clients.md @@ -0,0 +1,47 @@ +# Pleroma Clients +Note: Additionnal clients may be working but theses are officially supporting Pleroma. + +## Roma +- Homepage: +- Source Code: ??? +- Platforms: iOS, Android + +## Roma for Desktop +- Homepage: +- Source Code: ??? +- Platforms: Windows, Mac, (Linux?) + +## Mastalab +- Source Code: +- Contact: [@tom79@mastodon.social](https://mastodon.social/users/tom79) +- Platforms: Android + +## Whalebird +- Homepage: +- Source Code: +- Contact: [@h3poteto@pleroma.io](https://pleroma.io/users/h3poteto) +- Platforms: Windows, Mac, Linux + +## Tusky +- Homepage: +- Source Code: +- Contact: [@ConnyDuck@mastodon.social](https://mastodon.social/users/ConnyDuck) +- Platforms: Android + +## Tootdon +- Homepage: , +- Source Code: ??? +- Contact: [@tootdon@mstdn.jp](https://mstdn.jp/users/tootdon) +- Platforms: Android, iOS + +## Amaroq +- Homepage: +- Source Code: +- Contact: [@eurasierboy@mastodon.social](https://mastodon.social/users/eurasierboy) +- Platforms: iOS + +## Subway Tooter +- Source Code: +- Homepage: +- Contact: [@tateisu@mastodon.juggler.jp](https://mastodon.juggler.jp/users/tateisu), [@SubwayTooter@mastodon.juggler.jp](https://mastodon.juggler.jp/users/SubwayTooter) +- Platforms: Android -- cgit v1.2.3 From 5f767be3311101cb97a161dc0b164c406151cf3d Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 28 Jan 2019 18:20:10 +0100 Subject: docs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore --- docs/Clients.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'docs') diff --git a/docs/Clients.md b/docs/Clients.md index f90f82bfe..22d9bcf0e 100644 --- a/docs/Clients.md +++ b/docs/Clients.md @@ -1,5 +1,30 @@ # Pleroma Clients Note: Additionnal clients may be working but theses are officially supporting Pleroma. +Feel free to contact us to be added to this list! + +## Brutaldon +- Homepage: +- Source Code: +- Contact: [@gcupc@glitch.social](https://glitch.social/users/gcupc) +- Platforms: Web + +## Sengi +- Source Code: +- Contact: [@sengi_app@mastodon.social](https://mastodon.social/users/sengi_app) +- Platforms: Web +- Note(2019-01-28): The development is currently in a early stage. + +## Halcyon +- Source Code: +- Contact: [@halcyon@social.csswg.org](https://social.csswg.org/users/halcyon) +- Platforms: Web + +## Pinafore +- Homepage: +- Source Code: +- Contact: [@pinafore@mastodon.technology](https://mastodon.technology/users/pinafore) +- Note: Pleroma support is a secondary goal +- Platforms: Web ## Roma - Homepage: -- cgit v1.2.3 From 91a41ec67099d01647de65ac2b0393c61b24da0e Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 28 Jan 2019 18:28:25 +0100 Subject: docs/Clients.md: Add per-type sections helps differenciate between Electrons and others like Brutaldon. [ci skip] --- docs/Clients.md | 77 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 38 insertions(+), 39 deletions(-) (limited to 'docs') diff --git a/docs/Clients.md b/docs/Clients.md index 22d9bcf0e..3f783347e 100644 --- a/docs/Clients.md +++ b/docs/Clients.md @@ -2,71 +2,70 @@ Note: Additionnal clients may be working but theses are officially supporting Pleroma. Feel free to contact us to be added to this list! -## Brutaldon -- Homepage: -- Source Code: -- Contact: [@gcupc@glitch.social](https://glitch.social/users/gcupc) -- Platforms: Web - -## Sengi -- Source Code: -- Contact: [@sengi_app@mastodon.social](https://mastodon.social/users/sengi_app) -- Platforms: Web -- Note(2019-01-28): The development is currently in a early stage. - -## Halcyon -- Source Code: -- Contact: [@halcyon@social.csswg.org](https://social.csswg.org/users/halcyon) -- Platforms: Web +## Desktop +### Roma for Desktop +- Homepage: +- Source Code: ??? +- Platforms: Windows, Mac, (Linux?) -## Pinafore -- Homepage: -- Source Code: -- Contact: [@pinafore@mastodon.technology](https://mastodon.technology/users/pinafore) -- Note: Pleroma support is a secondary goal -- Platforms: Web +### Whalebird +- Homepage: +- Source Code: +- Contact: [@h3poteto@pleroma.io](https://pleroma.io/users/h3poteto) +- Platforms: Windows, Mac, Linux -## Roma +## Handheld +### Roma - Homepage: - Source Code: ??? - Platforms: iOS, Android -## Roma for Desktop -- Homepage: -- Source Code: ??? -- Platforms: Windows, Mac, (Linux?) - -## Mastalab +### Mastalab - Source Code: - Contact: [@tom79@mastodon.social](https://mastodon.social/users/tom79) - Platforms: Android -## Whalebird -- Homepage: -- Source Code: -- Contact: [@h3poteto@pleroma.io](https://pleroma.io/users/h3poteto) -- Platforms: Windows, Mac, Linux - -## Tusky +### Tusky - Homepage: - Source Code: - Contact: [@ConnyDuck@mastodon.social](https://mastodon.social/users/ConnyDuck) - Platforms: Android -## Tootdon +### Tootdon - Homepage: , - Source Code: ??? - Contact: [@tootdon@mstdn.jp](https://mstdn.jp/users/tootdon) - Platforms: Android, iOS -## Amaroq +### Amaroq - Homepage: - Source Code: - Contact: [@eurasierboy@mastodon.social](https://mastodon.social/users/eurasierboy) - Platforms: iOS -## Subway Tooter +### Subway Tooter - Source Code: - Homepage: - Contact: [@tateisu@mastodon.juggler.jp](https://mastodon.juggler.jp/users/tateisu), [@SubwayTooter@mastodon.juggler.jp](https://mastodon.juggler.jp/users/SubwayTooter) - Platforms: Android + +## Alternative Web Interfaces +### Brutaldon +- Homepage: +- Source Code: +- Contact: [@gcupc@glitch.social](https://glitch.social/users/gcupc) + +### Sengi +- Source Code: +- Contact: [@sengi_app@mastodon.social](https://mastodon.social/users/sengi_app) +- Note(2019-01-28): The development is currently in a early stage. + +### Halcyon +- Source Code: +- Contact: [@halcyon@social.csswg.org](https://social.csswg.org/users/halcyon) + +### Pinafore +- Homepage: +- Source Code: +- Contact: [@pinafore@mastodon.technology](https://mastodon.technology/users/pinafore) +- Note: Pleroma support is a secondary goal -- cgit v1.2.3 From f2d5989ffa92bd4a18d9107a6ae57177482fc5b2 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 28 Jan 2019 18:39:29 +0100 Subject: docs/Clients.md: Add Social (GNOME) [ci skip] --- docs/Clients.md | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs') diff --git a/docs/Clients.md b/docs/Clients.md index 3f783347e..696f31643 100644 --- a/docs/Clients.md +++ b/docs/Clients.md @@ -14,6 +14,12 @@ Feel free to contact us to be added to this list! - Contact: [@h3poteto@pleroma.io](https://pleroma.io/users/h3poteto) - Platforms: Windows, Mac, Linux +### Social +- Source Code: +- Contact: [@brainblasted@social.libre.fi](https://social.libre.fi/users/brainblasted) +- Platforms: Linux (GNOME) +- Note(2019-01-28): Not at a pre-alpha stage yet + ## Handheld ### Roma - Homepage: -- cgit v1.2.3 From daa25f3403bac0abce06a7d68cae57f11c04bcfb Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 10 Feb 2019 14:24:48 +0100 Subject: docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically [ci skip] --- docs/Clients.md | 60 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'docs') diff --git a/docs/Clients.md b/docs/Clients.md index 696f31643..8e39fd7c4 100644 --- a/docs/Clients.md +++ b/docs/Clients.md @@ -8,34 +8,34 @@ Feel free to contact us to be added to this list! - Source Code: ??? - Platforms: Windows, Mac, (Linux?) -### Whalebird -- Homepage: -- Source Code: -- Contact: [@h3poteto@pleroma.io](https://pleroma.io/users/h3poteto) -- Platforms: Windows, Mac, Linux - ### Social - Source Code: - Contact: [@brainblasted@social.libre.fi](https://social.libre.fi/users/brainblasted) - Platforms: Linux (GNOME) - Note(2019-01-28): Not at a pre-alpha stage yet +### Whalebird +- Homepage: +- Source Code: +- Contact: [@h3poteto@pleroma.io](https://pleroma.io/users/h3poteto) +- Platforms: Windows, Mac, Linux + ## Handheld -### Roma -- Homepage: -- Source Code: ??? -- Platforms: iOS, Android +### Amaroq +- Homepage: +- Source Code: +- Contact: [@eurasierboy@mastodon.social](https://mastodon.social/users/eurasierboy) +- Platforms: iOS ### Mastalab - Source Code: - Contact: [@tom79@mastodon.social](https://mastodon.social/users/tom79) - Platforms: Android -### Tusky -- Homepage: -- Source Code: -- Contact: [@ConnyDuck@mastodon.social](https://mastodon.social/users/ConnyDuck) -- Platforms: Android +### Roma +- Homepage: +- Source Code: ??? +- Platforms: iOS, Android ### Tootdon - Homepage: , @@ -43,29 +43,24 @@ Feel free to contact us to be added to this list! - Contact: [@tootdon@mstdn.jp](https://mstdn.jp/users/tootdon) - Platforms: Android, iOS -### Amaroq -- Homepage: -- Source Code: -- Contact: [@eurasierboy@mastodon.social](https://mastodon.social/users/eurasierboy) -- Platforms: iOS - -### Subway Tooter -- Source Code: -- Homepage: -- Contact: [@tateisu@mastodon.juggler.jp](https://mastodon.juggler.jp/users/tateisu), [@SubwayTooter@mastodon.juggler.jp](https://mastodon.juggler.jp/users/SubwayTooter) +### Tusky +- Homepage: +- Source Code: +- Contact: [@ConnyDuck@mastodon.social](https://mastodon.social/users/ConnyDuck) - Platforms: Android +### Twidere +- Homepage: +- Source Code: , +- Contact: +- Platform: Android, iOS + ## Alternative Web Interfaces ### Brutaldon - Homepage: - Source Code: - Contact: [@gcupc@glitch.social](https://glitch.social/users/gcupc) -### Sengi -- Source Code: -- Contact: [@sengi_app@mastodon.social](https://mastodon.social/users/sengi_app) -- Note(2019-01-28): The development is currently in a early stage. - ### Halcyon - Source Code: - Contact: [@halcyon@social.csswg.org](https://social.csswg.org/users/halcyon) @@ -75,3 +70,8 @@ Feel free to contact us to be added to this list! - Source Code: - Contact: [@pinafore@mastodon.technology](https://mastodon.technology/users/pinafore) - Note: Pleroma support is a secondary goal + +### Sengi +- Source Code: +- Contact: [@sengi_app@mastodon.social](https://mastodon.social/users/sengi_app) +- Note(2019-01-28): The development is currently in a early stage. -- cgit v1.2.3 From 94385313b56e99f234b1a5173e6a39829fbc6150 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 10 Feb 2019 14:42:32 +0100 Subject: docs/Clients.md: Add Nekonium [ci skip] --- docs/Clients.md | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs') diff --git a/docs/Clients.md b/docs/Clients.md index 8e39fd7c4..28f8afafd 100644 --- a/docs/Clients.md +++ b/docs/Clients.md @@ -27,6 +27,12 @@ Feel free to contact us to be added to this list! - Contact: [@eurasierboy@mastodon.social](https://mastodon.social/users/eurasierboy) - Platforms: iOS +### Nekonium +- Homepage: [F-Droid Repository](https://repo.gdgd.jp.net/), [Google Play](https://play.google.com/store/apps/details?id=com.apps.nekonium), [Amazon](https://www.amazon.co.jp/dp/B076FXPRBC/) +- Source: +- Contact: [@lin@pleroma.gdgd.jp.net](https://pleroma.gdgd.jp.net/users/lin) +- Platforms: Android + ### Mastalab - Source Code: - Contact: [@tom79@mastodon.social](https://mastodon.social/users/tom79) -- cgit v1.2.3 From db407e4d504ce9f72db9e26b39944f13daee5f22 Mon Sep 17 00:00:00 2001 From: succfemboi Date: Sun, 10 Feb 2019 16:18:04 +0100 Subject: add feather to webclients --- docs/Clients.md | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs') diff --git a/docs/Clients.md b/docs/Clients.md index 28f8afafd..057f12392 100644 --- a/docs/Clients.md +++ b/docs/Clients.md @@ -67,6 +67,10 @@ Feel free to contact us to be added to this list! - Source Code: - Contact: [@gcupc@glitch.social](https://glitch.social/users/gcupc) +### Feather +- Source Code: +- Contact: [@kaniini@pleroma.site](https://pleroma.site/kaniini) + ### Halcyon - Source Code: - Contact: [@halcyon@social.csswg.org](https://social.csswg.org/users/halcyon) -- cgit v1.2.3