Merge pull request #113722 from rgrunbla/galene-03

galene: 0.2 -> 0.3 and bugfix of the associated module

Sandro c10752cc 0ec1f94e

Changed files
+7 -5
nixos
modules
services
web-apps
pkgs
servers
web-apps
galene
+4 -2
nixos/modules/services/web-apps/galene.nix
···
wantedBy = [ "multi-user.target" ];
preStart = ''
-
install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem
-
install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem
+
${optionalString (cfg.insecure != true) ''
+
install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem
+
install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem
+
''}
'';
serviceConfig = mkMerge [
+3 -3
pkgs/servers/web-apps/galene/default.nix
···
buildGoModule rec {
pname = "galene";
-
version = "0.2";
+
version = "0.3";
src = fetchFromGitHub {
owner = "jech";
repo = "galene";
rev = "galene-${version}";
-
sha256 = "0hpgqqv8mp1d3sk7dk49m3yv0cv4afa0v3vdd4w8mdnx6pcqdgy1";
+
sha256 = "1pl3mnkmfqykhq55q36kvvnvn9fgsk72pfa7nii3hywzad0bj0ar";
};
-
vendorSha256 = "12b7andpzsgzmd56gg4gc5ilkxvjrpwpmwbdmygfzgkd5jncmcgp";
+
vendorSha256 = "0jrc6y5chkj25bnpzn6blvfb0vd09h6fdcz75g54605z8nqd397p";
outputs = [ "out" "static" ];