Merge master into staging-next

2021-03-29 18:13:15 +00:00
parent b1788736fd 4344033bac
commit f7049b343c
30 changed files with 592 additions and 536 deletions
@@ -88,7 +88,7 @@ in
        enable = true;
        after = [ "network.target" ];
        wantedBy = [ "multi-user.target" ];
-        serviceConfig.ExecStart = "${pkgs.pythonPackages.zerobin}/bin/zerobin ${cfg.listenAddress} ${toString cfg.listenPort} false ${cfg.user} ${cfg.group} ${zerobin_config}";
+        serviceConfig.ExecStart = "${pkgs.zerobin}/bin/zerobin ${cfg.listenAddress} ${toString cfg.listenPort} false ${cfg.user} ${cfg.group} ${zerobin_config}";
        serviceConfig.PrivateTmp="yes";
        serviceConfig.User = cfg.user;
        serviceConfig.Group = cfg.group;