Merge branch 'Uberspace:main' into patch-3

machinaeXphilip · Dec 29, 2022 · 7e30ec1 · 7e30ec1
2 parents 86a90c7 + 5dbeeb0
commit 7e30ec1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 22 deletions.
diff --git a/source/guide_firefly-iii.rst b/source/guide_firefly-iii.rst
@@ -46,17 +46,17 @@ Installation
 
 ``cd`` to the directory one level above your :manual:`document root <web-documentroot>`, then install Firefly III via composer. You can find the latest version on the `release tracker`_, replace the version below with the version number.
 
-.. code-block:: console
+.. code-block:: bash
  :emphasize-lines: 1
 
  [isabell@stardust ~]$ cd /var/www/virtual/$USER/
- [isabell@stardust isabell]$ composer create-project grumpydictator/firefly-iii --no-dev --prefer-dist firefly_iii 5.4.6
+ [isabell@stardust isabell]$ composer create-project grumpydictator/firefly-iii --no-dev --prefer-dist firefly_iii 5.7.15
  [...]
  [isabell@stardust isabell]$
 
 After the installation has finished, remove your unused :manual:`DocumentRoot <web-documentroot>` and create a new symbolic link to the ``firefly_iii/public`` directory.
 
-.. code-block:: console
+.. code-block:: bash
 
  [isabell@stardust ~]$ cd /var/www/virtual/$USER/
  [isabell@stardust isabell]$ rm -f html/nocontent.html; rmdir html
@@ -68,15 +68,15 @@ Configuration
 
 We suggest you use an :manual_anchor:`additional database <database-mysql.html#additional-databases>` for Firefly III to save your data. You have to create this database first.
 
-.. code-block:: console
+.. code-block:: bash
  :emphasize-lines: 1
 
  [isabell@stardust ~]$ mysql -e "CREATE DATABASE ${USER}_fireflyiii"
  [isabell@stardust ~]$
 
 ``cd`` into your Firefly III directory.
 
-.. code-block:: console
+.. code-block:: bash
 
  [isabell@stardust isabell]$ cd firefly_iii
  [isabell@stardust firefly_iii]$
@@ -89,7 +89,7 @@ Finishing installation
 ======================
 To finish the installation and setup your database run the following commands:
 
-.. code-block:: console
+.. code-block:: bash
  :emphasize-lines: 1,2,3
 
  [isabell@stardust firefly_iii]$ php artisan migrate:refresh --seed
@@ -109,7 +109,7 @@ Mail
 
 To setup Firefly III to be able to send mails, you first have to create a :manual_anchor:`new mailbox user <mail-mailboxes.html#additional-mailboxes>`:
 
-.. code-block:: console
+.. code-block:: bash
 
   [isabell@stardust ~]$ uberspace mail user add firefly_iii
   Enter a password for the mailbox:
@@ -149,7 +149,7 @@ Updates
 
 To update your Firefly III installation, ``cd`` to the directory one level above your :manual:`document root <web-documentroot>`, then download the new version via composer. Replace <next_version> with the latest version.
 
-.. code-block:: console
+.. code-block:: bash
  :emphasize-lines: 1,2
 
  [isabell@stardust ~]$ cd /var/www/virtual/$USER/
@@ -160,7 +160,7 @@ To update your Firefly III installation, ``cd`` to the directory one level above
 
 After the installation has finished, we need to copy over our settings located in the ``.env`` file and other data.
 
-.. code-block:: console
+.. code-block:: bash
  :emphasize-lines: 1,2,3
 
  [isabell@stardust isabell]$ cp firefly_iii/.env firefly-iii-updated/.env
@@ -170,7 +170,7 @@ After the installation has finished, we need to copy over our settings located i
 
 Navigate into the newly created folder and run the following commands to finish the upgrade:
 
-.. code-block:: console
+.. code-block:: bash
  :emphasize-lines: 1
 
  [isabell@stardust isabell]$ cd firefly-iii-updated
@@ -184,7 +184,7 @@ Navigate into the newly created folder and run the following commands to finish
 
 Move one folder up again and rename the updated folder, so our :manual:`document root <web-documentroot>` points to the updated version.
 
-.. code-block:: console
+.. code-block:: bash
  :emphasize-lines: 1,2,3
 
  [isabell@stardust firefly-iii-updated]$ cd ..

diff --git a/source/guide_gotify.rst b/source/guide_gotify.rst
@@ -59,7 +59,7 @@ Like a lot of Go software, gotify is distributed as a single binary. Download go
 ::
 
   [isabell@stardust ~]$ mkdir ~/gotify && cd ~/gotify
-  [isabell@stardust gotify]$ wget https://github.com/gotify/server/releases/download/v2.0.10/gotify-linux-amd64.zip
+  [isabell@stardust gotify]$ wget https://github.com/gotify/server/releases/latest/download/gotify-linux-amd64.zip
   Resolving github.com (github.com)... 140.82.118.4
   Connecting to github.com (github.com)|140.82.118.4|:443... connected.
   HTTP request sent, awaiting response... 302 Found

diff --git a/source/guide_synapse.rst b/source/guide_synapse.rst
@@ -66,16 +66,12 @@ We will install synapse using pip, which makes it quite easy:
       Using cached https://files.pythonhosted.org/packages/e6/60/247f23a7121ae632d62811ba7f273d0e58972d75e58a94d329d51550a47d/urllib3-1.25.3-py2.py3-none-any.whl
     Installing collected packages: pyasn1, pyasn1-modules, attrs, constantly, idna, hyperlink, zope.interface, six, Automat, PyHamcrest, incremental, Twisted, msgpack, simplejson, frozendict, canonicaljson, sortedcontainers, pyyaml, pycparser, cffi, pynacl, asn1crypto, cryptography, service-identity, unpaddedbase64, signedjson, pillow, daemonize, chardet, certifi, urllib3, requests, treq, bcrypt, pymacaroons, pyopenssl, psutil, pyrsistent, jsonschema, netaddr, phonenumbers, prometheus-client, matrix-synapse
     Successfully installed Automat-0.7.0 PyHamcrest-1.9.0 Twisted-19.2.1 asn1crypto-0.24.0 attrs-19.1.0 bcrypt-3.1.6 canonicaljson-1.1.4 certifi-2019.6.16 cffi-1.12.3 chardet-3.0.4 constantly-15.1.0 cryptography-2.7 daemonize-2.5.0 frozendict-1.2 hyperlink-19.0.0 idna-2.8 incremental-17.5.0 jsonschema-3.0.1 matrix-synapse-1.0.0 msgpack-0.6.1 netaddr-0.7.19 phonenumbers-8.10.13 pillow-6.0.0 prometheus-client-0.3.1 psutil-5.6.3 pyasn1-0.4.5 pyasn1-modules-0.2.5 pycparser-2.19 pymacaroons-0.13.0 pynacl-1.3.0 pyopenssl-19.0.0 pyrsistent-0.15.2 pyyaml-5.1.1 requests-2.22.0 service-identity-18.1.0 signedjson-1.0.0 simplejson-3.16.0 six-1.12.0 sortedcontainers-2.1.0 treq-18.6.0 unpaddedbase64-1.1.0 urllib3-1.25.3 zope.interface-4.6.0
-  [isabell@stardust ~]$ pip3.9 install --user psycopg2
-    Collecting psycopg2
-      Downloading https://files.pythonhosted.org/packages/5c/1c/6997288da181277a0c29bc39a5f9143ff20b8c99f2a7d059cfb55163e165/psycopg2-2.8.3.tar.gz (377kB)
-         |████████████████████████████████| 378kB 21.4MB/s
-    Building wheels for collected packages: psycopg2
-      Building wheel for psycopg2 (setup.py) ... done
-      Stored in directory: /home/matrites/.cache/pip/wheels/48/06/67/475967017d99b988421b87bf7ee5fad0dad789dc349561786b
-    Successfully built psycopg2
-    Installing collected packages: psycopg2
-    Successfully installed psycopg2-2.8.3
+  [isabell@stardust ~]$ pip3.9 install --user psycopg2-binary
+    Collecting psycopg2-binary
+      Downloading psycopg2_binary-2.9.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (3.0 MB)
+         |████████████████████████████████| 3.0 MB 30.0 MB/s
+    Installing collected packages: psycopg2-binary
+    Successfully installed psycopg2-binary-2.9.5
 
   [isabell@stardust ~]$