From 215df3f322e5d26a6e51df468869aa796f7f37f0 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 4 Aug 2022 14:18:32 -0400 Subject: [PATCH 1/4] Add lemmy-ui config link. (#145) --- src/en/administration/configuration.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/en/administration/configuration.md b/src/en/administration/configuration.md index 9a1b449..2093670 100644 --- a/src/en/administration/configuration.md +++ b/src/en/administration/configuration.md @@ -17,4 +17,8 @@ cd server ```hjson {{#include ../../../include/config/defaults.hjson}} -``` \ No newline at end of file +``` + +## Lemmy-UI configuration + +Lemmy-UI can be configured using environment variables, detailed in its [README](https://github.com/LemmyNet/lemmy-ui#readme). From 809f0bc756330abd15e60e733c2b9fdbff37bd0b Mon Sep 17 00:00:00 2001 From: Nutomic Date: Fri, 2 Sep 2022 16:40:05 +0200 Subject: [PATCH 2/4] Include stable Lemmy tag (fixes #146) (#147) --- update-includes.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/update-includes.sh b/update-includes.sh index 12a005c..35f46c2 100755 --- a/update-includes.sh +++ b/update-includes.sh @@ -1,4 +1,15 @@ #!/bin/bash set -e -git clone https://github.com/LemmyNet/lemmy.git include --depth 1 \ No newline at end of file +LEMMY_VERSION=$(curl "https://raw.githubusercontent.com/LemmyNet/lemmy-ansible/main/VERSION") +if [ ! -d "include/.git" ] +then + git clone https://github.com/LemmyNet/lemmy.git include + cd include +else + cd include + git checkout main + git pull +fi +git fetch --tags +git checkout "$LEMMY_VERSION" \ No newline at end of file From 95565e57b6b0d74378e6a9d81f9af6ea638c333d Mon Sep 17 00:00:00 2001 From: Nutomic Date: Sat, 3 Sep 2022 15:05:07 +0200 Subject: [PATCH 3/4] Add curl to CI (#148) --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 262b489..a1d7b73 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,6 +14,6 @@ steps: - cargo install mdbook --git https://github.com/Ruin0x11/mdBook.git --branch localization --rev 9d8147c --force --debug - apt-get update - - apt-get install git -y + - apt-get install git curl -y - ./update-includes.sh - mdbook build . From 1f600af4c241ba2e779a54fe0528193c210376aa Mon Sep 17 00:00:00 2001 From: Nutomic Date: Fri, 11 Nov 2022 14:49:02 +0000 Subject: [PATCH 4/4] Fix path of lemmy.hjson download Fixes https://github.com/LemmyNet/lemmy/issues/2552 --- src/en/administration/install_docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/en/administration/install_docker.md b/src/en/administration/install_docker.md index 8acfd2f..f9c8418 100644 --- a/src/en/administration/install_docker.md +++ b/src/en/administration/install_docker.md @@ -9,7 +9,7 @@ cd /lemmy # download default config files wget https://raw.githubusercontent.com/LemmyNet/lemmy/main/docker/prod/docker-compose.yml -wget https://raw.githubusercontent.com/LemmyNet/lemmy/main/docker/lemmy.hjson +wget https://raw.githubusercontent.com/LemmyNet/lemmy/main/docker/prod/lemmy.hjson # Set correct permissions for pictrs folder mkdir -p volumes/pictrs