From b81779f71fcf0581bb8b217cc0e3950b071324bc Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 6 Sep 2021 14:22:23 -0400 Subject: [PATCH] Remove iframely. --- src/en/administration/from_scratch.md | 67 ------------------------ src/en/administration/install_docker.md | 1 - src/en/contributing/local_development.md | 3 +- 3 files changed, 1 insertion(+), 70 deletions(-) diff --git a/src/en/administration/from_scratch.md b/src/en/administration/from_scratch.md index 411bd5f..3fb6b26 100644 --- a/src/en/administration/from_scratch.md +++ b/src/en/administration/from_scratch.md @@ -101,35 +101,6 @@ sudo -u postgres psql -c "create user lemmy with password 'password' superuser;" sudo -u postgres psql -c 'create database lemmy with owner lemmy;' -U postgres ``` -### iFramely install - -git and nodejs required, but nodejs should be installed as a dependency of yarn. - -#### Mentioned in case iFramely installed on separate system - -```bash -useradd -m -s /bin/bash iframely - -cd ~iframely -sudo -Hu iframely git clone https://github.com/itteco/iframely.git -cd iframely -sudo -Hu iframely git tag -l -sudo -Hu iframely git checkout tags/v1.5.0 -sudo -Hu iframely npm install -``` - -Replace port 80 in this config? - why not leave at 8061; also, potentially replace or disable cache storage for now? (CACHE_ENGINE: 'no-cache') - -```bash -sudo -Hu iframely cp ~lemmy/lemmy/docker/iframely.config.local.js ~lemmy/iframely/config.local.js -``` - -Start the iframely server OR, use an [init script](#initiframely) instead, which is better than running this manually - -```bash -sudo -Hu iframely node server -``` - ### pict-rs install ```bash @@ -232,19 +203,6 @@ yarn build:prod restart lemmy-ui -### iFramely update - -```bash -su - iframely -cd iframely -git fetch -git tag -l -git checkout tags/v1.6.0 # Or whatever the current appropriate release is -npm install -``` - -restart iframely - ### pict-rs update ```bash @@ -283,7 +241,6 @@ config/config.hjson example port: 8536 docs_dir: "/home/lemmy/lemmy/docs/book" pictrs_url: "http://localhost:9000" - iframely_url: "http://localhost:8061" federation: { enabled: true allowed_instances: "" @@ -299,30 +256,6 @@ config/config.hjson example ### init scripts -##### init/iframely - -```bash -#!/sbin/openrc-run - -name="Iframely Daemon" - -depend() { - need localmount - need net -} - -start() { - ebegin "Starting Iframely" - start-stop-daemon --start --background --make-pidfile --user iframely --group iframely --pidfile /home/iframely/iframely.pid --chdir /home/iframely/iframely -3 /usr/bin/logger -4 /usr/bin/logger --exec node -- server - eend $? -} - -stop() { - start-stop-daemon --stop --signal TERM --pidfile /home/iframely/iframely.pid - eend $? -} -``` - ##### init/lemmy ```bash diff --git a/src/en/administration/install_docker.md b/src/en/administration/install_docker.md index 4796fe5..2732d14 100644 --- a/src/en/administration/install_docker.md +++ b/src/en/administration/install_docker.md @@ -10,7 +10,6 @@ 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/iframely.config.local.js # Set correct permissions for pictrs folder mkdir -p volumes/pictrs diff --git a/src/en/contributing/local_development.md b/src/en/contributing/local_development.md index 5f23490..1f58ef0 100644 --- a/src/en/contributing/local_development.md +++ b/src/en/contributing/local_development.md @@ -99,6 +99,5 @@ yarn dev and go to [localhost:1234](http://localhost:1234). Front end saves should rebuild the project. -Note that this setup doesn't include image uploads or link previews (provided by pict-rs and -iframely respectively). If you want to test those, you should use the +Note that this setup doesn't include image uploads. If you want to test those, you should use the [Docker development](docker_development.md).