From 79facd2bb62349c1a818ba563fdf267dc806c9fd Mon Sep 17 00:00:00 2001 From: netali Date: Fri, 29 Dec 2023 04:21:00 +0100 Subject: [PATCH] zammad: refactor package --- .../networking/misc/zammad/default.nix | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix index fde6f943d517..ed178fc9c1ab 100644 --- a/pkgs/applications/networking/misc/zammad/default.nix +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -7,7 +7,6 @@ , bundlerEnv , defaultGemConfig , callPackage -, writeText , procps , ruby , postgresql @@ -19,6 +18,7 @@ , yarn2nix-moretea , cacert , redis +, dataDir ? "/var/lib/zammad" }: let @@ -26,9 +26,7 @@ let version = "6.3.1"; src = applyPatches { - src = fetchFromGitHub (lib.importJSON ./source.json); - patches = [ ./fix-sendmail-location.diff ]; @@ -41,16 +39,6 @@ let ''; }; - databaseConfig = writeText "database.yml" '' - production: - url: <%= ENV['DATABASE_URL'] %> - ''; - - secretsConfig = writeText "secrets.yml" '' - production: - secret_key_base: <%= ENV['SECRET_KEY_BASE'] %> - ''; - rubyEnv = bundlerEnv { name = "${pname}-gems-${version}"; inherit version; @@ -156,9 +144,12 @@ stdenv.mkDerivation { installPhase = '' cp -R . $out - cp ${databaseConfig} $out/config/database.yml - cp ${secretsConfig} $out/config/secrets.yml - sed -i -e "s|info|debug|" $out/config/environments/production.rb + rm -rf $out/config/database.yml $out/config/secrets.yml $out/tmp $out/log + # dataDir will be set in the module, and the package gets overriden there + ln -s ${dataDir}/config/database.yml $out/config/database.yml + ln -s ${dataDir}/config/secrets.yml $out/config/secrets.yml + ln -s ${dataDir}/tmp $out/tmp + ln -s ${dataDir}/log $out/log ''; passthru = {