Changeset 578

Show
Ignore:
Timestamp:
12/22/04 22:33:48 (7 years ago)
Author:
jimmyo
Message:

Remove hardcoding of default user/group to run the plugin (SF#1083251).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    • Property cvs2svn:cvs-rev changed from 1.243 to 1.244
    r577 r578  
    77  * Main: Bugfix when using long labels and CGI graphing. 
    88  * Node: Fix bug when encountering strange environment (Deb#285173). 
     9  * Node: Remove hardcoding of default user/group to run the plugin as 
     10    (SF#1083251). 
    911  * Packaging: Expand man-page macros properly on man-page generation  
    1012    (Deb#286399). 

  • trunk/Makefile

    • Property cvs2svn:cvs-rev changed from 1.32 to 1.33
    r565 r578  
    141141                    -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g'                 \ 
    142142                    -e 's|@@CGIDIR@@|$(CGIDIR)|g'                       \ 
     143                    -e 's|@@USER@@|$(USER)|g'                           \ 
     144                    -e 's|@@GROUP@@|$(GROUP)|g'                         \ 
     145                    -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g'               \ 
    143146                    $$file > build/$$destname;                          \ 
    144147        done 

  • trunk/Makefile.config

    • Property cvs2svn:cvs-rev changed from 1.8 to 1.9
    r503 r578  
    6969GROUP      = munin 
    7070 
     71# Default user to run the plugins as 
     72PLUGINUSER = nobody 
     73 
    7174# Which command to use to check if the USER and GROUP to run Munin as, exists. 
    7275GETENT = $(shell which getent || which true 2>/dev/null) 

  • trunk/node/munin-node.in

    • Property cvs2svn:cvs-rev changed from 1.19 to 1.20
    r540 r578  
    2121# 
    2222# $Log$ 
     23# Revision 1.20  2004/12/22 21:33:48  jimmyo 
     24# Remove hardcoding of default user/group to run the plugin (SF#1083251). 
     25# 
    2326# Revision 1.19  2004/12/09 20:03:25  jimmyo 
    2427# Added two new plugins contributed by Jacques Caruso, generic/exim_mailqueue_alt and generic/mailscanner. 
    …… 
    141144my $do_version = 0; 
    142145my $VERSION="@@VERSION@@"; 
    143 my $defuser = getpwnam ("nobody"); 
    144 my $defgroup= getgrnam ("munin"); 
     146my $defuser = getpwnam ("@@PLUGINUSER@@"); 
     147my $defgroup= getgrnam ("@@GROUP@@"); 
    145148my $paranoia= 0; 
    146149my @ignores = (); 

  • trunk/node/munin-run.in

    • Property cvs2svn:cvs-rev changed from 1.11 to 1.12
    r570 r578  
    2121# 
    2222# $Log$ 
     23# Revision 1.12  2004/12/22 21:33:48  jimmyo 
     24# Remove hardcoding of default user/group to run the plugin (SF#1083251). 
     25# 
    2326# Revision 1.11  2004/12/22 20:48:23  jimmyo 
    2427# Fix bug when encountering strange environment. 
    …… 
    107110my $do_version = 0; 
    108111my $VERSION="@@VERSION@@"; 
    109 my $defuser = getpwnam ("nobody"); 
    110 my $defgroup= getgrnam ("munin"); 
     112my $defuser = getpwnam ("@@PLUGINUSER@@"); 
     113my $defgroup= getgrnam ("@@GROUP@@"); 
    111114my $paranoia = 0; 
    112115my @ignores = ();