commit 1537ce9dc7673a66971e6f8f6ff20a215f75a618 · pyrox.dev/nixpkgs

+8 -5
nixos/modules/services/network-filesystems/samba.nix
···

       54
       54
        
             };

     

       55
       55
        
       

     

       56
       56
        
             serviceConfig = {

     

       57
       57
       -
               ExecStart = "${samba}/sbin/${appName} ${args}";

     

       57
       57
       +
               ExecStart = "${samba}/sbin/${appName} --foreground --no-process-group ${args}";

     

       58
       58
        
               ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

     

       59
       59
        
               LimitNOFILE = 16384;

     

       60
       60
       +
               PIDFile = "/run/${appName}.pid";

     

       60
       61
        
               Type = "notify";

     

       62
       62
       +
               NotifyAccess = "all"; #may not do anything...

     

       61
       63
        
             };

     

       62
       64
        
       

     

       63
       65
        
             restartTriggers = [ configFile ];

     
···

       231
       233
        
                   after = [ "samba-setup.service" "network.target" ];

     

       232
       234
        
                   wantedBy = [ "multi-user.target" ];

     

       233
       235
        
                 };

     

       234
       234
       -
       

     

       236
       236
       +
                 # Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd

     

       237
       237
       +
                 # for correct use with systemd

     

       235
       238
        
                 services = {

     

       236
       236
       -
                   "samba-smbd" = daemonService "smbd" "-F";

     

       237
       237
       -
                   "samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" "-F");

     

       238
       238
       -
                   "samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" "-F");

     

       239
       239
       +
                   "samba-smbd" = daemonService "smbd" "";

     

       240
       240
       +
                   "samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" "");

     

       241
       241
       +
                   "samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" "");

     

       239
       242
        
                   "samba-setup" = {

     

       240
       243
        
                     description = "Samba Setup Task";

     

       241
       244
        
                     script = setupScript;