Changeset 34 for devel

Timestamp:

01/24/08 20:05:59 (4 years ago)

Author:

bruno

Message:

first working packages for common and dhcp.
dhcp needs more work to handle correctly subnet, which was not considered up to now

Location:

devel

Files:

• dploy-common/install.sh (modified) (1 diff)
• dploy-dhcp/bin/dploy-add2dhcp (modified) (2 diffs)
• dploy-dhcp/install.sh (modified) (2 diffs)
• pbconf/dploy-common (added)
• pbconf/dploy-common/rpm (added)
• pbconf/dploy-common/rpm/dploy-common.spec (added)
• pbconf/dploy-dhcp/rpm/dploy-dhcp.spec (modified) (3 diffs)
• pbconf/dploy.pb (modified) (3 diffs)
• pbconf/pbfilter/all.pbf (modified) (1 diff)
• pbconf/pbfilter/rpm.pbf (modified) (1 diff)

devel/dploy-common/install.sh

@@ -6 +6 @@
 if [ "_$PREFIX" != "_" ]; then
     local=${DESTDIR}$PREFIX
+    conf=${DESTDIR}$CONFDIR
 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."
+    conf=$local/$CONFDIR
 fi
 
 echo "PBPKG PBVER-rPBREV will be installed under $local"
-mkdir -p $local/share/data
-cd $local/share/data
+mkdir -p $conf/keys
+cd $conf/keys
 ssh-keygen -b 1024 -t dsa -f dploy_id_dsa -q -N ""

devel/dploy-dhcp/bin/dploy-add2dhcp

@@ -20 +20 @@
 #
 
-my $mac=$ARGV[0];
+my $mac=$ARGV[0] || "";
 
 if ($mac !~ /^(?:[[:xdigit:]]{1,2}[-:]){5}[[:xdigit:]]{1,2}$/) {
@@ -30 +30 @@
 $mac =~ tr/A-Z/a-z/;
 
-my $ip=$ARGV[1];
+my $ip=$ARGV[1] || "";
 
 if ($ip !~ /^([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])$/) {

devel/dploy-dhcp/install.sh

@@ -6 +6 @@
 if [ "_$PREFIX" != "_" ]; then
     local=${DESTDIR}$PREFIX
+    conf=$CONFDIR
 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."
+    conf=$local/$CONFDIR
 fi
 
@@ -14 +16 @@
 mkdir -p $local/bin
 install -m 0755 bin/dploy-add2dhcp $local/bin 
+
+# The script need to know where the CONFDIR is
+perl -pi -e "s|PBCONF|$conf|" $local/bin/dploy-add2dhcp

devel/pbconf/dploy-dhcp/rpm/dploy-dhcp.spec

@@ -28 +28 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 export DESTDIR=$RPM_BUILD_ROOT
-export PREFIX=%{_exec_prefix}
+export PREFIX=%{_exec_prefix} 
+export CONFDIR=%{_sysconfdir}/PBPROJ
 ./install.sh
 
@@ -42 +43 @@
 %post
 # Include our configuration file in std dhcp.conf file
-grep -qE '^include "PBCONF/dhcpd.conf";' /etc/dhcpd.conf
+grep -qE '^include "%{_sysconfdir}/PBPROJ/dhcpd.conf";' /etc/dhcpd.conf
 if [ $? -ne 0 ]; then
-    echo 'include "PBCONF/dhcpd.conf";' >> /etc/dhcpd.conf
+    echo 'include "%{_sysconfdir}/PBPROJ/dhcpd.conf";' >> /etc/dhcpd.conf
 fi
 
@@ -50 +51 @@
 grep -qE '^dploy ' /etc/sudoers
 if [ $? -ne 0 ]; then
-    echo 'dploy ALL=NOPASSWD: /etc/init.d/dhcpd ?*' >> /etc/dhcpd.conf
+    echo 'dploy ALL=NOPASSWD: /etc/init.d/dhcpd ?*' >> /etc/sudoers
 fi
 

devel/pbconf/dploy.pb

@@ -67 +67 @@
 #
 pkgver dploy-dhcp = devel
+pkgver dploy-common = devel
 pkgver dploy-pxe = devel
 #pkgtag dploy-dhcp = 3
@@ -74 +75 @@
 # Hash of default package/package directory
 defpkgdir dploy-dhcp = dploy-dhcp
+defpkgdir dploy-common = dploy-common
 defpkgdir dploy-pxe = dploy-pxe
 
@@ -84 +86 @@
 # List of files per pkg on which to apply filters
 # Files are mentioned relatively to pbroot/defpkgdir
-filteredfiles dploy-dhcp = install.sh,bin/dploy-add2dhcp,
+filteredfiles dploy-dhcp = install.sh,bin/dploy-add2dhcp
+filteredfiles dploy-common = install.sh
 #filteredfiles pkg1-doc = configure.in

devel/pbconf/pbfilter/all.pbf

@@ -34 +34 @@
 filter PBURL = http://www.dploy.org
 
-# Where are stored conf files
-filter PBCONF = /etc/dploy.org
+# Project Name
+filter PBPROJ = $pbproj

devel/pbconf/pbfilter/rpm.pbf

@@ -10 +10 @@
 
 # PBDEP is replaced by the list of dependencies
-filter PBDEP =
+filter PBDEP = 
 
 # PBSUF is replaced by the package name ($pbpkg in code)