Merge pull request #113722 from rgrunbla/galene-03

galene: 0.2 -> 0.3 and bugfix of the associated module
2021-03-21 05:31:30 +01:00
parent 0ec1f94e32 8f84dab8a1
commit c10752cc4f
2 changed files with 7 additions and 5 deletions
@@ -133,8 +133,10 @@ in
      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 [