Merge branch 'Uberspace:main' into guide-tomcat

fischerling · Jan 27, 2022 · 929c034 · 929c034
2 parents 4f88c0a + 63d79b5
commit 929c034
Show file tree

Hide file tree

Showing 30 changed files with 784 additions and 55 deletions.
diff --git a/source/_static/images/friendica.svg b/source/_static/images/friendica.svg
diff --git a/source/_static/images/monica.png b/source/_static/images/monica.png
diff --git a/source/_static/images/uptime-kuma.svg b/source/_static/images/uptime-kuma.svg
diff --git a/source/dict.txt b/source/dict.txt
@@ -9,6 +9,7 @@ amd
 Ampache
 ampache
 analytics
+Antragsgrün
 apache
 api
 appserver
@@ -104,6 +105,8 @@ dev
 devs
 dhparam
 Diffie
+Directus
+directus
 disqus
 Django
 django
@@ -136,6 +139,8 @@ expirations
 ezmlm
 favourite
 FDroid
+Fediverse
+fediverse
 Feyer
 filename
 filenames
@@ -152,9 +157,13 @@ formulae
 Framadata
 Framadate
 freemium
+Friendica
+friendica
 frontend
 frontends
+Funkwhale
 gamers
+geospatial
 Gitea
 gitea
 gitfs
@@ -192,6 +201,7 @@ htm
 html
 httpd
 https
+Hubzilla
 hugo
 Humhub
 humhub
@@ -218,6 +228,8 @@ isabell
 Isso
 isso
 javascript
+Jellyfin
+jellyfin
 Jingo
 Jinja
 Joomla
@@ -231,6 +243,7 @@ kanban
 Kanboard
 Kasper
 Kawaguchi
+keyFile
 keyfile
 keyfiles
 keyring
@@ -248,6 +261,7 @@ licence
 licenced
 Lindberg
 linux
+listmonk
 localhost
 logfile
 Logfiles
@@ -287,6 +301,7 @@ minio
 mnesia
 Mongo
 mongo
+mongodb
 mongorc
 Monolog
 Moodle
@@ -320,6 +335,7 @@ openpgpkey
 openssl
 Oplog
 organising
+OStatus
 osTicket
 packagist
 partdb
@@ -373,6 +389,7 @@ quickstart
 Rackup
 Radicale
 radicale
+rc
 Readline
 realtime
 recache
@@ -475,6 +492,7 @@ tinymce
 tld
 todos
 transactional
+transcodes
 Trello
 ttl
 Tumblr
@@ -488,6 +506,7 @@ Uberspaces
 udocker
 udp
 UI
+ui
 Umami
 umami
 uncheck
@@ -505,6 +524,7 @@ userid
 Username
 username
 usernames
+uuNotify
 uvicorn
 uWSGI
 uwsgi

diff --git a/source/guide_antragsgruen.rst b/source/guide_antragsgruen.rst
@@ -15,7 +15,7 @@ Antragsgrün
 
 .. tag_list::
 
-Antragsgrün_ is an open source web tool used by organisations such as the European and German Green Parties for discussing motions, amendments, and candidacies. It is written in PHP and distributed under the GPLv3 license
+Antragsgrün_ is an open source web tool used by organizations such as the European and German Green Parties for discussing motions, amendments, and candidacies. It is written in PHP and distributed under the GPLv3 license.
 
 ----
 

diff --git a/source/guide_babybuddy.rst b/source/guide_babybuddy.rst
@@ -7,10 +7,10 @@
 .. tag:: activity-tracking
 .. tag:: audience-family
 
-.. sidebar:: About
+.. sidebar:: Logo
 
-.. image:: _static/images/babybuddy.png
-    :align: center
+  .. image:: _static/images/babybuddy.png
+      :align: center
 
 ##########
 Baby Buddy
@@ -113,7 +113,7 @@ Install all the requirements.
 ::
 
  [isabell@stardust ~]$ cd ~/babybuddy/public/
- [isabell@stardust public]$ pipenv install --python python3.8
+ [isabell@stardust public]$ pipenv install --python python3.6
  [...]
    🐍   ▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉ 39/39 — 00:00:54
  To activate this project's virtualenv, run pipenv shell.

diff --git a/source/guide_conduit.rst b/source/guide_conduit.rst
@@ -66,7 +66,7 @@ Conduit manages it's own database files. Create a directory for it:
 ::
 
   [isabell@stardust ~]$ mkdir -p ~/conduit_data/
-  [isabell@stardust ~]$ 
+  [isabell@stardust ~]$
 
 Create ``~/conduit.toml`` with the following content:
 
@@ -88,7 +88,7 @@ Create ``~/conduit.toml`` with the following content:
  server_name = "<username>.uber.space"
 
  # This is the only directory where Conduit will save its data
- database_path = "/home/<username>/conduit_data/conduit.db"
+ database_path = "/home/<username>/conduit_data"
 
  port = 6167
 
@@ -157,7 +157,7 @@ Create the directory ``~/html/.well-known/matrix/``:
 ::
 
   [isabell@stardust ~]$ mkdir -p ~/conduit_data/
-  [isabell@stardust ~]$ 
+  [isabell@stardust ~]$
 
 Then create ``~/html/.well-known/matrix/server`` with the following content.
 Remember to replace <username> with your actual user name:

diff --git a/source/guide_ejabberd.rst b/source/guide_ejabberd.rst
@@ -4,7 +4,7 @@
 
 .. tag:: XMPP
 .. tag:: Jabber
-.. tag:: Instant Messanging
+.. tag:: Instant Messaging
 
 .. highlight:: console
 

diff --git a/source/guide_embetty.rst b/source/guide_embetty.rst
@@ -73,7 +73,7 @@ Use ``npm`` to install the latest version of Embetty server:
   [...]
   added 182 packages
   [isabell@stardust ~]$
-  
+
 
 
 Configuration

diff --git a/source/guide_focalboard.rst b/source/guide_focalboard.rst
@@ -68,11 +68,13 @@ If PostgreSQL is used, the database configuration also needs to be adjusted. Edi
  "dbconfig": "postgres://<db_user>:<db_password>@localhost/<db_name>?sslmode=disable&connect_timeout=10",
 
 For example:
+
 .. code-block:: json
 
  "dbtype": "postgres",
  "dbconfig": "postgres://isabell_focalboard:sup3r-s3cr3t@localhost/focalboard?sslmode=disable&connect_timeout=10",
 
+
 Setup daemon
 ------------
 

diff --git a/source/guide_foundryvtt.rst b/source/guide_foundryvtt.rst
@@ -8,7 +8,7 @@
 .. tag:: RPG
 
 .. sidebar:: Logo
- 
+
   .. image:: _static/images/foundryvtt.png
       :align: center
 
@@ -32,12 +32,12 @@ Foundry VTT
 License
 =======
 
-Foundry Virtual Tabletop is not free software, but you can host it on your own server. 
+Foundry Virtual Tabletop is not free software, but you can host it on your own server.
 
 Prerequisites
 ==============
 
-You need to purchase a `license key <https://foundryvtt.com/purchase/>`_ to run your own version of Foundry Virtual Tabletop. 
+You need to purchase a `license key <https://foundryvtt.com/purchase/>`_ to run your own version of Foundry Virtual Tabletop.
 
 Foundry requires the use of :manual:`Node.js <lang-nodejs>` 14.
 
@@ -127,8 +127,8 @@ Best practices
 Security
 --------
 
-  * Change the default admin passwort in the config tab **immediately** after installation.
-  * When you create a new world in Foundry it does not have a password by default. Keep in mind to setup a passwort after world creation.
+  * Change the default admin password in the config tab **immediately** after installation.
+  * When you create a new world in Foundry it does not have a password by default. Keep in mind to setup a password after world creation.
 
 ----
 Tested with Foundry 0.8.7, Uberspace 7.1.1
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ Antragsgrün @@
     .. tag_list::
-    Antragsgrün_ is an open source web tool used by organisations such as the European and German Green Parties for discussing motions, amendments, and candidacies. It is written in PHP and distributed under the GPLv3 license
+    Antragsgrün_ is an open source web tool used by organizations such as the European and German Green Parties for discussing motions, amendments, and candidacies. It is written in PHP and distributed under the GPLv3 license.
     ----
@@ Expand Down @@