commit a2dc37c7d1390d8aad8e2d888feb5bcd28656f4a · pyrox.dev/nixpkgs

+41

pkgs/servers/monitoring/munin/adding_sconfdir_munin-node.patch

···

       1
       1
       +
       commit af5fa3623bb9a73052f9154be4a0f38c60ea42a2

     

       2
       2
       +
       Author: Kjetil Orbekk <kjetil.orbekk@gmail.com>

     

       3
       3
       +
       Date:   Thu Nov 23 21:21:36 2017 -0500

     

       4
       4
       +
       

     

       5
       5
       +
           node: add --sconfdir to set plugin configuration dir

     

       6
       6
       +
       

     

       7
       7
       +
       diff --git a/node/sbin/munin-node b/node/sbin/munin-node

     

       8
       8
       +
       index 909c8c4e..0ccf3941 100755

     

       9
       9
       +
       --- a/node/sbin/munin-node

     

       10
       10
       +
       +++ b/node/sbin/munin-node

     

       11
       11
       +
       @@ -100,9 +100,11 @@ sub parse_args

     

       12
       12
       +
            my @ORIG_ARGV  = @ARGV;

     

       13
       13
       +
        

     

       14
       14
       +
            my $servicedir_cmdline;

     

       15
       15
       +
       +    my $sconfdir_cmdline;

     

       16
       16
       +
            print_usage_and_exit() unless GetOptions(

     

       17
       17
       +
                "config=s"     => \$conffile,

     

       18
       18
       +
                "servicedir=s" => \$servicedir_cmdline,

     

       19
       19
       +
       +        "sconfdir=s"   => \$sconfdir_cmdline,

     

       20
       20
       +
                "debug!"       => \$DEBUG,

     

       21
       21
       +
                "pidebug!"     => \$PIDEBUG,

     

       22
       22
       +
                "paranoia!"    => \$paranoia,

     

       23
       23
       +
       @@ -112,6 +114,7 @@ sub parse_args

     

       24
       24
       +
        

     

       25
       25
       +
            # We untaint the args brutally, since the sysadm should know what he does

     

       26
       26
       +
            $servicedir = $1 if defined $servicedir_cmdline && $servicedir_cmdline =~ m/(.*)/;

     

       27
       27
       +
       +    $sconfdir = $1 if defined $sconfdir_cmdline && $sconfdir_cmdline =~ m/(.*)/;

     

       28
       28
       +
        

     

       29
       29
       +
            # Reset ARGV (for HUPing)

     

       30
       30
       +
            @ARGV = @ORIG_ARGV;

     

       31
       31
       +
       @@ -175,6 +178,10 @@ Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]

     

       32
       32
       +
        

     

       33
       33
       +
        Override plugin directory [@@CONFDIR@@/plugins/]

     

       34
       34
       +
        

     

       35
       35
       +
       +=item B<< --sconfdir <dir> >>

     

       36
       36
       +
       +

     

       37
       37
       +
       +Override plugin configuration directory [@@CONFDIR@@/plugin-conf.d/]

     

       38
       38
       +
       +

     

       39
       39
       +
        =item B< --[no]paranoia >

     

       40
       40
       +
        

     

       41
       41
       +
        Only run plugins owned by root. Check permissions as well. [--noparanoia]

pkgs/servers/monitoring/munin/default.nix

···

       68
       68
        
           # https://github.com/munin-monitoring/munin/pull/134

     

       69
       69
        
           ./adding_servicedir_munin-node.patch

     

       70
       70
        
       

     

       71
       71
       +
           ./adding_sconfdir_munin-node.patch

     

       71
       72
        
           ./preserve_environment.patch

     

       72
       73
        
         ];

     

       73
       74