diff --git a/machines/fuuko/configuration.nix b/machines/fuuko/configuration.nix index 7738a30..f39501d 100644 --- a/machines/fuuko/configuration.nix +++ b/machines/fuuko/configuration.nix @@ -8,7 +8,6 @@ ./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/renge/configuration.nix b/machines/renge/configuration.nix index 38e0b2c..dab4d0d 100644 --- a/machines/renge/configuration.nix +++ b/machines/renge/configuration.nix @@ -4,6 +4,7 @@ ../../modules ./services/gitea.nix + ./services/hedgedoc.nix ]; sbruder = { diff --git a/machines/fuuko/services/hedgedoc.nix b/machines/renge/services/hedgedoc.nix similarity index 90% rename from machines/fuuko/services/hedgedoc.nix rename to machines/renge/services/hedgedoc.nix index 0f1a404..a5e91a2 100644 --- a/machines/fuuko/services/hedgedoc.nix +++ b/machines/renge/services/hedgedoc.nix @@ -7,7 +7,7 @@ in enable = true; ensureDatabases = [ "hedgedoc" ]; ensureUsers = lib.singleton { - name = "codimd"; + name = "hedgedoc"; ensurePermissions = { "DATABASE hedgedoc" = "ALL PRIVILEGES"; }; @@ -22,14 +22,13 @@ 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"; }; }; @@ -51,7 +50,7 @@ in }; systemd.tmpfiles.rules = [ - "d ${cfg.configuration.uploadsPath} 0700 codimd codimd - -" + "d ${cfg.configuration.uploadsPath} 0700 hedgedoc hedgedoc - -" ]; services.nginx.virtualHosts."pad.sbruder.de" = {