Changeset 63

Timestamp:

06/05/08 16:23:10 (4 years ago)

Author:

bruno

Message:

Save current state of art :-) remains to do is the conf file for Apache with dploy-dhcp. focus on post install deloyment

Location:

devel

Files:

• dploy-common/bin/dploy-common-post (modified) (1 diff)
• dploy-dhcp/bin/dploy-dhcp-post (modified) (2 diffs)
• dploy-pxe/bin/dploy-pxe-post (modified) (3 diffs)
• dploy-pxe/install.sh (modified) (1 diff)

devel/dploy-common/bin/dploy-common-post

@@ -87 +87 @@
 chown $uid,$gid,$keyf;
 chmod 0600,$keyf;
+
+chown $uid,$gid,PBCONF;
+chmod 0755,PBCONF;

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

@@ -8 +8 @@
 use strict;
 use ProjectBuilder::Base;
+use ProjectBuilder::Conf;
 
 =pod
@@ -54 +55 @@
 my ($login,$pass,$uid,$gid,$gecos,$dir,$shell) = getpwnam($user) or die "$user not in passwd file";
 
-chown 0,$gid,"/etc/dhcpd.conf";
-chmod 0644,"/etc/dhcpd.conf";
+pb_conf_add("PBCONF/dploy.conf");
+my ($pathdhcp) = pb_conf_get("pathdhcp");
+
+chown 0,$gid,$pathdhcp->{$ENV{'PBPROJ'}};
+chmod 0644,$pathdhcp->{$ENV{'PBPROJ'}};
 
 # Include dploy in sudoers

devel/dploy-pxe/bin/dploy-pxe-post

@@ -7 +7 @@
 
 use strict;
+use File::Basename;
+use File::Copy;
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
@@ -71 +73 @@
 
 pb_conf_add("PBCONF/dploy.conf");
-my ($pxepath) = pb_conf_get("pxepath");
+my ($pathpxe) = pb_conf_get("pathpxe");
 
-foreach $d ("$pxepath->{$ENV{'PBPROJ'}}", "$pxepath->{$ENV{'PBPROJ'}}/../linuxcoe", "$pxepath->{$ENV{'PBPROJ'}}/../mondorescue") {
+# Create dir structure
+foreach $d ("$pathpxe->{$ENV{'PBPROJ'}}", "$pathpxe->{$ENV{'PBPROJ'}}/../linuxcoe", "$pathpxe->{$ENV{'PBPROJ'}}/../mondorescue") {
     pb_mkdir_p($d) if ( not -d $d);
     chown $uid,$gid,$d;
@@ -79 +82 @@
 }
 
+# Adapt tftp xinetd conf file
+my $xin = "";
+$xin = "/etc/xinetd.d/tftp" if (! -f $xin);
+$xin = "/etc/xinetd.d/tftpd" if (! -f $xin);
+
+open(XIN,$xin)  || die "Unable to read $xin: $!";
+open(OUT,"$xin.tmp")  || die "Unable to write $xin.tmp: $!";
+while (<XIN>) {
+    s/disable(\s*)=(\s*)yes/disable$1=$2no/;
+    s/server_args(\s*)=(\s*)(.*)/change_parms($1,$2,$3)/;
+    print OUT;
+}
+close(XIN);
+close(OUT);
+move("$xin.tmp",$xin);
+
+# Restart xinetd
+pb_system("/etc/init.d/xinetd restart","Restarting xinetd");
+
+# Restart Apache
+pb_system("/etc/init.d/apache restart","Restarting Apache");
+
+# PBHTTPDCONFDIR
+# Prepare Apache conf for kickstart support for LinuxCOE
+
+sub change_parms() {
+    
+    my ($s1, $s2, $params) = @_;
+    print "# Modified by dploy.org\n";
+    print "# server_args$s1=$s2$params\n";
+    my $dir = dirname($pathpxe->{$ENV{'PBPROJ'}});
+    $params =~ s/-s\s+\S+\s+/-s $dir/;
+    print "server_args$s1=$s2$params\n";
+$xin)}

devel/dploy-pxe/install.sh

@@ -18 +18 @@
 install -m 0755 bin/dploy-pxe-post $local/bin 
 
-# The script need to know where the CONFDIR is
+# The scripts need to know where the CONFDIR is
 perl -pi -e "s|PBCONF|$conf|" $local/bin/dploy-add2pxe $local/bin/dploy-pxe-post