From 3bfa19a5099021d0ad08155d97f070d51a982629 Mon Sep 17 00:00:00 2001 From: JocelynDelalande Date: Fri, 8 Jun 2018 22:37:10 +0000 Subject: [PATCH 1/5] Fix doc: rmdir -> rm -rf rmdir will fail on that non-empty dir --- docs/installation/debian.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/debian.rst b/docs/installation/debian.rst index 2a9f39ea5..b3691ac1e 100644 --- a/docs/installation/debian.rst +++ b/docs/installation/debian.rst @@ -90,7 +90,7 @@ First, we'll download the latest api release. curl -L -o "api-|version|.zip" "https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/|version|/download?job=build_api" unzip "api-|version|.zip" -d extracted mv extracted/api/* api/ - rmdir extracted + rm -rf extracted Then we'll download the frontend files: From 7fec060040dec6d6e308d7e51f94c17d3460c567 Mon Sep 17 00:00:00 2001 From: JocelynDelalande Date: Fri, 8 Jun 2018 22:39:31 +0000 Subject: [PATCH 2/5] Add missing dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without that, starting from a debian « naked » system, it will fail at the `pip install wheel` stage. --- docs/installation/debian.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/debian.rst b/docs/installation/debian.rst index b3691ac1e..b5492080a 100644 --- a/docs/installation/debian.rst +++ b/docs/installation/debian.rst @@ -23,7 +23,7 @@ default on system. You can install them using: .. code-block:: shell sudo apt-get update - sudo apt-get install curl python3-venv git unzip + sudo apt-get install curl python3-pip python3-venv git unzip Layout From 7988363352b1ac30926b70d5ebceaedf73bd7d84 Mon Sep 17 00:00:00 2001 From: JocelynDelalande Date: Fri, 8 Jun 2018 23:06:05 +0000 Subject: [PATCH 3/5] Fix wrong name in postgresql database --- docs/installation/external_dependencies.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/external_dependencies.rst b/docs/installation/external_dependencies.rst index 39d32b38f..df9282797 100644 --- a/docs/installation/external_dependencies.rst +++ b/docs/installation/external_dependencies.rst @@ -32,7 +32,7 @@ Create the project database and user: .. code-block:: shell - CREATE DATABASE "scratch" + CREATE DATABASE "funkwhale" WITH ENCODING 'utf8' LC_COLLATE = 'en_US.utf8' LC_CTYPE = 'en_US.utf8'; From 938aa2c8f142cb35fe7180dd1df104fe9138be97 Mon Sep 17 00:00:00 2001 From: JocelynDelalande Date: Fri, 8 Jun 2018 23:09:46 +0000 Subject: [PATCH 4/5] Remove constraint on LC_COLLATE and LC_CTYPE Which will fail if the system does not contains this locale. --- docs/installation/external_dependencies.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/installation/external_dependencies.rst b/docs/installation/external_dependencies.rst index df9282797..5d66dd601 100644 --- a/docs/installation/external_dependencies.rst +++ b/docs/installation/external_dependencies.rst @@ -33,9 +33,7 @@ Create the project database and user: .. code-block:: shell CREATE DATABASE "funkwhale" - WITH ENCODING 'utf8' - LC_COLLATE = 'en_US.utf8' - LC_CTYPE = 'en_US.utf8'; + WITH ENCODING 'utf8'; CREATE USER funkwhale; GRANT ALL PRIVILEGES ON DATABASE funkwhale TO funkwhale; From 7fa99750d92bbf42230098e3ee71c3a43debbbc5 Mon Sep 17 00:00:00 2001 From: JocelynDelalande Date: Fri, 8 Jun 2018 23:44:08 +0000 Subject: [PATCH 5/5] Mention the database name to create psql extension. Seems that the extensions are per-database. Without that tweak, the install will fail at django migrations step, yelling for insuficient rights to install the accent extension itself. --- docs/installation/external_dependencies.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/external_dependencies.rst b/docs/installation/external_dependencies.rst index 5d66dd601..adfb90e72 100644 --- a/docs/installation/external_dependencies.rst +++ b/docs/installation/external_dependencies.rst @@ -56,7 +56,7 @@ for funkwhale to work properly: .. code-block:: shell - sudo -u postgres psql -c 'CREATE EXTENSION "unaccent";' + sudo -u postgres psql funkwhale -c 'CREATE EXTENSION "unaccent";' Cache setup (Redis)