diff options
Diffstat (limited to '')
| -rw-r--r-- | hosts/flora/services/hedgedoc.nix | 5 | ||||
| -rw-r--r-- | hosts/flora/services/pleroma.nix | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/hosts/flora/services/hedgedoc.nix b/hosts/flora/services/hedgedoc.nix index 84721ce..038f99f 100644 --- a/hosts/flora/services/hedgedoc.nix +++ b/hosts/flora/services/hedgedoc.nix @@ -20,7 +20,7 @@ in config = {config, pkgs, ... }: { # open CodiMD port - networking.firewall.allowedTCPPorts = [ config.services.codimd.configuration.port ]; + networking.firewall.allowedTCPPorts = [ config.services.hedgedoc.configuration.port ]; # database (postgres 11), with default database reachable for CodiMD; no imperative config needed! services.postgresql = { @@ -28,7 +28,7 @@ in package = pkgs.postgresql_11; ensureDatabases = [ "codimd" ]; ensureUsers = [ { - name = "codimd"; + name = "hedgedoc"; ensurePermissions = { "DATABASE codimd" = "ALL PRIVILEGES";}; } ]; # ugly workaround to allow CodiMD to login without password — this service has lots of options, @@ -36,6 +36,7 @@ in authentication = pkgs.lib.mkForce '' # Generated file; do not edit! local all all trust + host codimd hedgedoc ::1/18 trust host codimd codimd ::1/128 trust ''; }; diff --git a/hosts/flora/services/pleroma.nix b/hosts/flora/services/pleroma.nix index a76a9eb..fca9d65 100644 --- a/hosts/flora/services/pleroma.nix +++ b/hosts/flora/services/pleroma.nix @@ -19,17 +19,18 @@ in config = {pkgs, config, ...}: { - # pleroma is only on unstable for now, so import it here - imports = [ "${sources.nixpkgs-unstable}/nixos/modules/services/networking/pleroma.nix" ]; # generating the manual will fail when mixing nixos channels, # so disable it here or this won't build at all. documentation.enable = false; # pleroma has a cli tool for configuration - environment.systemPackages = [ pkgs.pleroma pkgs.dnsutils ]; + environment.systemPackages = [ pkgs.dnsutils ]; services.pleroma = { enable = true; + + + package = (import sources.nixpkgs-unstable {}).pleroma; # this is barely necessary at this point — all that's # set in here is the default_signer for joken, and the |