Changeset 62 for devel/dploy-common

Timestamp:

06/04/08 16:41:16 (4 years ago)

Author:

bruno

Message:

Still working on post install scripts

Location:

devel/dploy-common

Files:

• Makefile.PL (modified) (2 diffs)
• bin/dploy-common-post (modified) (2 diffs)
• etc/dploy.conf (modified) (1 diff)
• install.sh (modified) (2 diffs)

devel/dploy-common/Makefile.PL

@@ -5 +5 @@
 # the contents of the Makefile that is written.
 WriteMakefile(
-    NAME         => 'dploy',
-    DISTNAME     => 'dploy',
+    NAME         => 'PBPKG',
+    DISTNAME     => 'PBPKG',
     VERSION      => 'PBVER',
     INST_SCRIPT  => 'blib/bin',
@@ -15 +15 @@
     },    # e.g., Module::Name => 1.1
     AUTHOR        => 'Bruno Cornec <bruno#dploy.org>',
-    #EXE_FILES     => [ qw( bin/dploy-check ) ],
-    #MAN1PODS      => { 'bin/pb' => '$(INST_MAN1DIR)/pb.$(MAN1EXT)', },
+    EXE_FILES     => [ qw( bin/PBPKG-post ) ],
+    MAN1PODS      => { 'bin/PBPKG-post' => '$(INST_MAN1DIR)/PBPKG-post.$(MAN1EXT)', },
     MAN3PODS      => { 'lib/Dploy/Base.pm' => '$(INST_MAN3DIR)/Dploy::Base.$(MAN3EXT)', },
 );

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

@@ -59 +59 @@
 chmod 0700,"$dir/.ssh";
 my $keyf = "$dir/.ssh/authorized_keys";
-my $pubf = "$ENV{'CONFDIR'}/keys/dploy_id_dsa.pub";
+my $pubf = "PBCONF/keys/dploy_id_dsa.pub";
 
 # Adds our key to that account authorized_keys
@@ -76 +76 @@
     close(KEYF);
 
-    if ($found == 1) {
+    if ($found == 0) {
         open(KEYF,">> $keyf") || die "Unable to append to $keyf: $!";
         print KEYF "$prot $key $mail";

devel/dploy-common/etc/dploy.conf

@@ -3 +3 @@
 
 # Folder path for PXE configuration files
-pathpxe default = /tftpboot/pxelinux.cfg
+pathpxe default = /var/cache/dploy/pxelinux.cfg
 
 # DHCP server IP address

devel/dploy-common/install.sh

@@ -9 +9 @@
 else
     local=/usr/local
-        echo $PATH | grep $local/bin > /dev/null || echo "Warning - your PATH environmental variable is BROKEN. Please add $local/bin to your PATH."
+    echo $PATH | grep $local/bin > /dev/null || echo "Warning - your PATH environmental variable is BROKEN. Please add $local/bin to your PATH."
     conf=$local/$CONFDIR
 fi
@@ -21 +21 @@
 install -m 0644 etc/dploy.conf $conf
 
+# Post install script
+install -m 0755 bin/dploy-common-post $local/bin
+
+# The script need to know where the CONFDIR is
+perl -pi -e "s|PBCONF|$conf|" $local/bin/dploy-common-post
+
 # Handling keys
 ssh-keygen -b 1024 -t dsa -f $conf/keys/dploy_id_dsa -q -N ""