From a9def8ddbc71033476fe68c358d81524b820d7f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= Date: Sun, 6 Sep 2020 04:04:19 +0100 Subject: [PATCH] rainloop: allow multiple instances to use the same package --- pkgs/servers/rainloop/default.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix index bff5d2ea306..42c68d5608e 100644 --- a/pkgs/servers/rainloop/default.nix +++ b/pkgs/servers/rainloop/default.nix @@ -24,7 +24,8 @@ */ function __get_custom_data_full_path() { - return '${dataPath}'; // custom data folder path + $v = getenv('RAINLOOP_DATA_DIR', TRUE); + return $v === FALSE ? '${dataPath}' : $v; } ''; @@ -33,6 +34,8 @@ cp -r rainloop/* $out rm -rf $out/data cp ${includeScript} $out/include.php + mkdir $out/data + chmod 700 $out/data ''; meta = with stdenv.lib; { @@ -44,13 +47,13 @@ maintainers = with maintainers; [ das_j ]; }; }); - in { - rainloop-community = common { - edition = "community"; - sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y"; - }; - rainloop-standard = common { - edition = ""; - sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch"; - }; - } +in { + rainloop-community = common { + edition = "community"; + sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y"; + }; + rainloop-standard = common { + edition = ""; + sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch"; + }; +}