Changeset 19877

Timestamp:

Oct 2, 2008, 5:27:59 PM (18 years ago)

Author:

jhoblitt

Message:

add --user and --group options to nebdiskd to select the user/group that daemon will run as

Location:

trunk/Nebulous-Server

Files:

• Changes (modified) (1 diff)
• bin/nebdiskd (modified) (4 diffs)

trunk/Nebulous-Server/Changes

@@ -14 +14 @@
       on hung NFS mounts
     - document neb-voladd --host option
+    - add --user and --group options to nebdiskd to select the user/group that
+      daemon will run as
 
 0.15 Thu Sep 11 13:00:59 HST 2008

trunk/Nebulous-Server/bin/nebdiskd

@@ -3 +3 @@
 # Copyright (C) 2007  Joshua Hoblitt
 # 
-# $Id: nebdiskd,v 1.9 2008-10-03 00:41:55 jhoblitt Exp $
+# $Id: nebdiskd,v 1.10 2008-10-03 03:27:59 jhoblitt Exp $
 
 use strict;
@@ -22 +22 @@
 use Pod::Usage qw( pod2usage );
 
-my ($debug, $db, $dbhost, $dbuser, $dbpass, $pidfile, $stop, $restart, $verbose);
+my (
+    $debug, 
+    $db, 
+    $dbhost, 
+    $dbuser, 
+    $dbpass, 
+    $pidfile, 
+    $stop, 
+    $restart, 
+    $verbose,
+    $user,
+    $group,
+);
+
 GetOptions(
-    'db|d=s'    => \$db,
-    'debug'     => \$debug,
-    'host|h=s'  => \$dbhost,
-    'pass|p=s'  => \$dbpass,
-    'pidfile=s' => \$pidfile,
-    'restart|r' => \$restart,
-    'stop|s'    => \$stop,
-    'user|u=s'  => \$dbuser,
-    'verbose|v' => \$verbose,
+    'dbhost|h=s'    => \$dbhost,
+    'dbpass|p=s'    => \$dbpass,
+    'dbuser|u=s'    => \$dbuser,
+    'db|D=s'        => \$db,
+    'debug|d'       => \$debug,
+    'group|g=s'     => \$group,
+    'pidfile=s'     => \$pidfile,
+    'restart|r'     => \$restart,
+    'stop|s'        => \$stop,
+    'user=s'        => \$user,
+    'verbose|v'     => \$verbose,
 ) || pod2usage( 2 );
 
@@ -40 +55 @@
 my $c = read_rcfile($rcfile);
 
-$db     ||= $c->get_db      || $ENV{'NEB_DB'};
-$dbhost ||= $c->get_dbhost  || $ENV{'NEB_DBHOST'} || 'localhost';
-$dbuser ||= $c->get_dbuser  || $ENV{'NEB_USER'};
-$dbpass ||= $c->get_dbpass  || $ENV{'NEB_PASS'};
-$pidfile ||= $c->get_pidfile || "/var/tmp/nebdiskd";
+$db         ||= $c->get_db      || $ENV{'NEB_DB'};
+$dbhost     ||= $c->get_dbhost  || $ENV{'NEB_DBHOST'} || 'localhost';
+$dbuser     ||= $c->get_dbuser  || $ENV{'NEB_USER'};
+$dbpass     ||= $c->get_dbpass  || $ENV{'NEB_PASS'};
+$pidfile    ||= $c->get_pidfile || "/var/tmp/nebdiskd";
+$user       ||= $c->get_user    || $<; # user
+$group      ||= $c->get_group   || $); # group
+
 my $mounts = $c->get_mounts;
 my $poll_interval = $c->get_poll_interval || 5;
@@ -66 +84 @@
 
 daemonize(
-    $<,     # User
-    $),     # Group
+    $user,     # User
+    $group,    # Group,
     $pidfile,  # PID file
 ) unless $debug;