commit 8f4f1ce005ceba182805d5a8866e39269b9a23a5 · pyrox.dev/nixpkgs

+37 -35
nixos/modules/programs/atop.nix
···

       123
       123
        
             boot.extraModulePackages = [ (lib.mkIf cfg.netatop.enable cfg.netatop.package) ];

     

       124
       124
        
             systemd =

     

       125
       125
        
               let

     

       126
       126
       -
                 mkSystemd = type: cond: name: restartTriggers: {

     

       127
       127
       -
                   ${name} = lib.mkIf cond {

     

       126
       126
       +
                 mkSystemd = type: name: restartTriggers: {

     

       127
       127
       +
                   ${name} = {

     

       128
       128
        
                     inherit restartTriggers;

     

       129
       129
        
                     wantedBy = [ (if type == "services" then "multi-user.target" else if type == "timers" then "timers.target" else null) ];

     

       130
       130
        
                   };

     
···

       134
       134
        
               in

     

       135
       135
        
               {

     

       136
       136
        
                 packages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ];

     

       137
       137
       -
                 services =

     

       138
       138
       -
                   mkService cfg.atopService.enable "atop" [ atop ]

     

       139
       139
       -
                   // lib.mkIf cfg.atopService.enable {

     

       140
       140
       -
                     # always convert logs to newer version first

     

       141
       141
       -
                     # XXX might trigger TimeoutStart but restarting atop.service will

     

       142
       142
       -
                     # convert remainings logs and start eventually

     

       143
       143
       -
                     atop.serviceConfig.ExecStartPre = pkgs.writeShellScript "atop-update-log-format" ''

     

       144
       144
       -
                       set -e -u

     

       145
       145
       -
                       shopt -s nullglob

     

       146
       146
       -
                       for logfile in "$LOGPATH"/atop_*

     

       147
       147
       -
                       do

     

       148
       148
       -
                         ${atop}/bin/atopconvert "$logfile" "$logfile".new

     

       149
       149
       -
                         # only replace old file if version was upgraded to avoid

     

       150
       150
       -
                         # false positives for atop-rotate.service

     

       151
       151
       -
                         if ! ${pkgs.diffutils}/bin/cmp -s "$logfile" "$logfile".new

     

       152
       152
       -
                         then

     

       153
       153
       -
                           ${pkgs.coreutils}/bin/mv -v -f "$logfile".new "$logfile"

     

       154
       154
       -
                         else

     

       155
       155
       -
                           ${pkgs.coreutils}/bin/rm -f "$logfile".new

     

       156
       156
       -
                         fi

     

       157
       157
       -
                       done

     

       158
       158
       -
                     '';

     

       159
       159
       -
                   }

     

       160
       160
       -
                   // mkService cfg.atopacctService.enable "atopacct" [ atop ]

     

       161
       161
       -
                   // mkService cfg.netatop.enable "netatop" [ cfg.netatop.package ]

     

       162
       162
       -
                   // mkService cfg.atopgpu.enable "atopgpu" [ atop ];

     

       163
       163
       -
                 timers = mkTimer cfg.atopRotateTimer.enable "atop-rotate" [ atop ];

     

       137
       137
       +
                 services = lib.mkMerge [

     

       138
       138
       +
                   (lib.mkIf cfg.atopService.enable (lib.recursiveUpdate

     

       139
       139
       +
                     (mkService "atop" [ atop ])

     

       140
       140
       +
                     {

     

       141
       141
       +
                       # always convert logs to newer version first

     

       142
       142
       +
                       # XXX might trigger TimeoutStart but restarting atop.service will

     

       143
       143
       +
                       # convert remainings logs and start eventually

     

       144
       144
       +
                       atop.preStart = ''

     

       145
       145
       +
                         set -e -u

     

       146
       146
       +
                         shopt -s nullglob

     

       147
       147
       +
                         for logfile in "$LOGPATH"/atop_*

     

       148
       148
       +
                         do

     

       149
       149
       +
                           ${atop}/bin/atopconvert "$logfile" "$logfile".new

     

       150
       150
       +
                           # only replace old file if version was upgraded to avoid

     

       151
       151
       +
                           # false positives for atop-rotate.service

     

       152
       152
       +
                           if ! ${pkgs.diffutils}/bin/cmp -s "$logfile" "$logfile".new

     

       153
       153
       +
                           then

     

       154
       154
       +
                             ${pkgs.coreutils}/bin/mv -v -f "$logfile".new "$logfile"

     

       155
       155
       +
                           else

     

       156
       156
       +
                             ${pkgs.coreutils}/bin/rm -f "$logfile".new

     

       157
       157
       +
                           fi

     

       158
       158
       +
                         done

     

       159
       159
       +
                       '';

     

       160
       160
       +
                     }))

     

       161
       161
       +
                   (lib.mkIf cfg.atopacctService.enable (mkService "atopacct" [ atop ]))

     

       162
       162
       +
                   (lib.mkIf cfg.netatop.enable (mkService "netatop" [ cfg.netatop.package ]))

     

       163
       163
       +
                   (lib.mkIf cfg.atopgpu.enable (mkService "atopgpu" [ atop ]))

     

       164
       164
       +
                 ];

     

       165
       165
       +
                 timers = lib.mkIf cfg.atopRotateTimer.enable (mkTimer "atop-rotate" [ atop ]);

     

       164
       166
        
               };

     

       165
       167
        
       

     

       166
       168
        
             security.wrappers = lib.mkIf cfg.setuidWrapper.enable {

     

       167
       167
       -
               atop =

     

       168
       168
       -
                 { setuid = true;

     

       169
       169
       -
                   owner = "root";

     

       170
       170
       -
                   group = "root";

     

       171
       171
       -
                   source = "${atop}/bin/atop";

     

       172
       172
       -
                 };

     

       169
       169
       +
               atop = {

     

       170
       170
       +
                 setuid = true;

     

       171
       171
       +
                 owner = "root";

     

       172
       172
       +
                 group = "root";

     

       173
       173
       +
                 source = "${atop}/bin/atop";

     

       174
       174
       +
               };

     

       173
       175
        
             };

     

       174
       176
        
           }

     

       175
       177
        
         );