diff options
author | Ninjatrappeur <NinjaTrappeur@users.noreply.github.com> | 2022-03-19 21:28:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-19 21:28:40 +0100 |
commit | 05417a66e7bfee5b0607a12eaf81db33a47a6afd (patch) | |
tree | 59a3290ca5c7050ede1d4964b4e8ad3e534edee1 /nixos/modules | |
parent | 53e4f8d2376c68dfdd614a123d5da0a8b10cf3be (diff) | |
parent | b205832efe0c92c58576ffe47851c90cd405ee4b (diff) | |
download | nixpkgs-05417a66e7bfee5b0607a12eaf81db33a47a6afd.tar nixpkgs-05417a66e7bfee5b0607a12eaf81db33a47a6afd.tar.gz nixpkgs-05417a66e7bfee5b0607a12eaf81db33a47a6afd.tar.bz2 nixpkgs-05417a66e7bfee5b0607a12eaf81db33a47a6afd.tar.lz nixpkgs-05417a66e7bfee5b0607a12eaf81db33a47a6afd.tar.xz nixpkgs-05417a66e7bfee5b0607a12eaf81db33a47a6afd.tar.zst nixpkgs-05417a66e7bfee5b0607a12eaf81db33a47a6afd.zip |
Merge pull request #164398 from NinjaTrappeur/nin/pleroma-wrappers
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/networking/pleroma.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index 9b8382392c0..c6d4c14dcb7 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -1,6 +1,7 @@ { config, options, lib, pkgs, stdenv, ... }: let cfg = config.services.pleroma; + cookieFile = "/var/lib/pleroma/.cookie"; in { options = { services.pleroma = with lib; { @@ -8,7 +9,7 @@ in { package = mkOption { type = types.package; - default = pkgs.pleroma; + default = pkgs.pleroma.override { inherit cookieFile; }; defaultText = literalExpression "pkgs.pleroma"; description = "Pleroma package to use."; }; @@ -100,7 +101,6 @@ in { after = [ "network-online.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; restartTriggers = [ config.environment.etc."/pleroma/config.exs".source ]; - environment.RELEASE_COOKIE = "/var/lib/pleroma/.cookie"; serviceConfig = { User = cfg.user; Group = cfg.group; @@ -118,10 +118,10 @@ in { # Better be safe than sorry migration-wise. ExecStartPre = let preScript = pkgs.writers.writeBashBin "pleromaStartPre" '' - if [ ! -f /var/lib/pleroma/.cookie ] + if [ ! -f "${cookieFile}" ] || [ ! -s "${cookieFile}" ] then echo "Creating cookie file" - dd if=/dev/urandom bs=1 count=16 | hexdump -e '16/1 "%02x"' > /var/lib/pleroma/.cookie + dd if=/dev/urandom bs=1 count=16 | ${pkgs.hexdump}/bin/hexdump -e '16/1 "%02x"' > "${cookieFile}" fi ${cfg.package}/bin/pleroma_ctl migrate ''; |