Merge pull request #97271 from Twey/rainloop-multiple-instances

rainloop: allow multiple instances to use the same package
This commit is contained in:
Sandro 2020-11-28 00:15:54 +01:00 committed by GitHub
commit fcf65032d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -24,7 +24,8 @@
*/ */
function __get_custom_data_full_path() 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 cp -r rainloop/* $out
rm -rf $out/data rm -rf $out/data
cp ${includeScript} $out/include.php cp ${includeScript} $out/include.php
mkdir $out/data
chmod 700 $out/data
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -44,13 +47,13 @@
maintainers = with maintainers; [ das_j ]; maintainers = with maintainers; [ das_j ];
}; };
}); });
in { in {
rainloop-community = common { rainloop-community = common {
edition = "community"; edition = "community";
sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y"; sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y";
}; };
rainloop-standard = common { rainloop-standard = common {
edition = ""; edition = "";
sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch"; sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch";
}; };
} }