free
/
freedombone
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Mention blocking on pleroma documentation

Bob Mottram 7 years ago
parent
59746d376a
commit
e08de3947c
2 changed files with 40 additions and 10 deletions
Unified View Show Diff Stats
  1. 9
    0
      doc/EN/app_pleroma.org
  2. 31
    10
      website/EN/app_pleroma.html

+ 9
- 0
doc/EN/app_pleroma.org View File

44 
 #+BEGIN_CENTER
 44 
 #+BEGIN_CENTER
45 
 [[file:images/pleromamastodon.jpg]]
 45 
 [[file:images/pleromamastodon.jpg]]
46 
 #+END_CENTER
 46 
 #+END_CENTER
47 
+
48 
+* Blocking controls
49 
+#+BEGIN_CENTER
50 
+[[file:images/controlpanel/control_panel_blocking.jpg]]
51 
+#+END_CENTER
52 
+
53 
+The biggest hazard with Pleroma is that it's part of a public federated communications system. This means that conversations and replies from other servers may end up in your "whole known network" stream. The internet being what it is, some of these could be undesirable. You can block individual users or entire domains by going to the *Administrator control panel* and selecting *Domain or User Blocking*, then adding or removing entries. This blocks domains at the firewall level and also at the level of database and file storage.
54 
+
55 
+If you want to block a particular user then select *Block a domain or user* and enter the user in the format *username@domaintoblock* (similar to an email address).

+ 31
- 10
website/EN/app_pleroma.html View File

3 
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 3 
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 
 <head>
 5 
 <head>
6 
-<!-- 2018-02-21 Wed 14:59 -->
6 
+<!-- 2018-02-21 Wed 15:01 -->
7 
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 7 
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8 
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 8 
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9 
 <title>&lrm;</title>
 9 
 <title>&lrm;</title>
268 
 </div>
 268 
 </div>
269 
 </div>
 269 
 </div>
270
270
271 
-<div id="outline-container-org06e6248" class="outline-2">
272 
-<h2 id="org06e6248">Installation</h2>
273 
-<div class="outline-text-2" id="text-org06e6248">
271 
+<div id="outline-container-org816a3b7" class="outline-2">
272 
+<h2 id="org816a3b7">Installation</h2>
273 
+<div class="outline-text-2" id="text-org816a3b7">
274 
 <p>
 274 
 <p>
275 
 Log into your system with:
 275 
 Log into your system with:
276 
 </p>
 276 
 </p>
290 
 </div>
 290 
 </div>
291 
 </div>
 291 
 </div>
292
292
293 
-<div id="outline-container-orgcf8ad56" class="outline-2">
294 
-<h2 id="orgcf8ad56">Initial setup</h2>
295 
-<div class="outline-text-2" id="text-orgcf8ad56">
293 
+<div id="outline-container-org45a79f8" class="outline-2">
294 
+<h2 id="org45a79f8">Initial setup</h2>
295 
+<div class="outline-text-2" id="text-org45a79f8">
296 
 <p>
 296 
 <p>
297 
 The first thing you'll need to do is register a new account. You can set your profile details and profile image by selecting the small settings icon to the right of your name.
 297 
 The first thing you'll need to do is register a new account. You can set your profile details and profile image by selecting the small settings icon to the right of your name.
298 
 </p>
 298 
 </p>
303 
 </div>
 303 
 </div>
304 
 </div>
 304 
 </div>
305
305
306 
-<div id="outline-container-org293d783" class="outline-2">
307 
-<h2 id="org293d783">Mastodon user interface</h2>
308 
-<div class="outline-text-2" id="text-org293d783">
306 
+<div id="outline-container-org083f41f" class="outline-2">
307 
+<h2 id="org083f41f">Mastodon user interface</h2>
308 
+<div class="outline-text-2" id="text-org083f41f">
309 
 <p>
 309 
 <p>
310 
 If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once you have registered an account navigate to <b>/yourpleromadomainname/web</b> and log in.
 310 
 If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once you have registered an account navigate to <b>/yourpleromadomainname/web</b> and log in.
311 
 </p>
 311 
 </p>
319 
 </div>
 319 
 </div>
320 
 </div>
 320 
 </div>
321 
 </div>
 321 
 </div>
322 
+
323 
+<div id="outline-container-orgc24d811" class="outline-2">
324 
+<h2 id="orgc24d811">Blocking controls</h2>
325 
+<div class="outline-text-2" id="text-orgc24d811">
326 
+<div class="org-center">
327 
+
328 
+<div class="figure">
329 
+<p><img src="images/controlpanel/control_panel_blocking.jpg" alt="control_panel_blocking.jpg" />
330 
+</p>
331 
+</div>
332 
+</div>
333 
+
334 
+<p>
335 
+The biggest hazard with Pleroma is that it's part of a public federated communications system. This means that conversations and replies from other servers may end up in your "whole known network" stream. The internet being what it is, some of these could be undesirable. You can block individual users or entire domains by going to the <b>Administrator control panel</b> and selecting <b>Domain or User Blocking</b>, then adding or removing entries. This blocks domains at the firewall level and also at the level of database and file storage.
336 
+</p>
337 
+
338 
+<p>
339 
+If you want to block a particular user then select <b>Block a domain or user</b> and enter the user in the format <b>username@domaintoblock</b> (similar to an email address).
340 
+</p>
341 
+</div>
342 
+</div>
322 
 </div>
 343 
 </div>
323 
 <div id="postamble" class="status">
 344 
 <div id="postamble" class="status">
324
345