Changeset 67 for devel

Timestamp:

08/05/08 17:40:48 (4 years ago)

Author:

bruno

Message:

For dhcp:

• Use of PBTMP
• Use of PBPROJ only once at begining, then a var. Avoids expansions which are not wanted.
• Use pb 0.9.3 syntx

File:

• devel/dploy-dhcp/bin/dploy-dhcp-post (modified) (5 diffs)

devel/dploy-dhcp/bin/dploy-dhcp-post

@@ -26 +26 @@
 =back
 
-No option nor parameter upported
+No option nor parameter supported
 
 =head1 WEB SITES
@@ -47 +47 @@
 =cut
 
+my $proj = "PBPROJ";
+
+pb_conf_init($proj);
 pb_syntax_init("dploy-dhcp-post\n");
 
@@ -52 +55 @@
 
 # Get dploy account info
-my $user = "PBPROJ";
+my $user = $proj;
 my ($login,$pass,$uid,$gid,$gecos,$dir,$shell) = getpwnam($user) or die "$user not in passwd file";
 
-pb_conf_add("PBCONF/dploy.conf");
+pb_conf_add("PBCONF/$proj.conf");
 my ($pathdhcp) = pb_conf_get("pathdhcp");
 
-chown 0,$gid,$pathdhcp->{$ENV{'PBPROJ'}};
-chmod 0644,$pathdhcp->{$ENV{'PBPROJ'}};
+chown 0,$gid,"$pathdhcp->{$proj}";
+chmod 0644,"$pathdhcp->{$proj}";
 
 # Include dploy in sudoers
@@ -65 +68 @@
 open(SUDO,"/etc/sudoers") || die "Unable to read /etc/sudoers";
 while (<SUDO>) {
-    $found = 1 if ((/^PBPROJ/) && (/\/init.d\/dhcpd/));
+    $found = 1 if ((/^$proj/) && (/\/init.d\/dhcpd/));
 }
 close(SUDO);
@@ -71 +74 @@
 if ($found == 0) {
     open(SUDO,">> /etc/sudoers") || die "Unable to write /etc/sudoers";
-    print SUDO "PBPROJ ALL=NOPASSWD: /etc/init.d/dhcpd ?*\n";
+    print SUDO "$proj ALL=NOPASSWD: /etc/init.d/dhcpd ?*\n";
     close(SUDO);
 }