From 76fee5875a08ea85668c2dc827dbab68e182e63f Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Tue, 22 Mar 2022 18:54:59 +0100 Subject: [PATCH] Revert "fuuko/hedgedoc: Migrate to okarin" This reverts commit bb6952cc095b43538b478a717e16cb62f8985c97. The performance on okarin is unbearably slow which makes hedgedoc time out on most requests. --- machines/fuuko/configuration.nix | 1 + machines/{okarin => fuuko}/services/hedgedoc.nix | 7 ++++--- machines/okarin/configuration.nix | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) rename machines/{okarin => fuuko}/services/hedgedoc.nix (90%) diff --git a/machines/fuuko/configuration.nix b/machines/fuuko/configuration.nix index f39501d..7738a30 100644 --- a/machines/fuuko/configuration.nix +++ b/machines/fuuko/configuration.nix @@ -8,6 +8,7 @@ ./services/binary-cache.nix ./services/dnsmasq.nix ./services/grafana.nix + ./services/hedgedoc.nix ./services/matrix ./services/media-backup.nix ./services/media.nix diff --git a/machines/okarin/services/hedgedoc.nix b/machines/fuuko/services/hedgedoc.nix similarity index 90% rename from machines/okarin/services/hedgedoc.nix rename to machines/fuuko/services/hedgedoc.nix index a5e91a2..0f1a404 100644 --- a/machines/okarin/services/hedgedoc.nix +++ b/machines/fuuko/services/hedgedoc.nix @@ -7,7 +7,7 @@ in enable = true; ensureDatabases = [ "hedgedoc" ]; ensureUsers = lib.singleton { - name = "hedgedoc"; + name = "codimd"; ensurePermissions = { "DATABASE hedgedoc" = "ALL PRIVILEGES"; }; @@ -22,13 +22,14 @@ in db = { dialect = "postgres"; host = "/run/postgresql"; - user = "hedgedoc"; + #user = "hedgedoc"; database = "hedgedoc"; }; domain = "pad.sbruder.de"; protocolUseSSL = true; csp.enable = true; imageUploadType = "filesystem"; + uploadsPath = "/data/hedgedoc/uploads"; }; }; @@ -50,7 +51,7 @@ in }; systemd.tmpfiles.rules = [ - "d ${cfg.configuration.uploadsPath} 0700 hedgedoc hedgedoc - -" + "d ${cfg.configuration.uploadsPath} 0700 codimd codimd - -" ]; services.nginx.virtualHosts."pad.sbruder.de" = { diff --git a/machines/okarin/configuration.nix b/machines/okarin/configuration.nix index fd80401..d567666 100644 --- a/machines/okarin/configuration.nix +++ b/machines/okarin/configuration.nix @@ -7,7 +7,6 @@ ./services/ankisyncd.nix ./services/gitea.nix - ./services/hedgedoc.nix ./services/invidious ./services/libreddit.nix ./services/nitter.nix