perfsonar development work

Author: dfn.calim
Date: 2011-08-30 14:49:50 +0100 (Tue, 30 Aug 2011)
New Revision: 732

Modified:
   
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd_0.53-0rc1_all.deb
   branches/perfsonar-oppd-all-0.53/build/debian/create-personar-oppd-dpkg.sh
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postinst
   branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postrm
   branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/preinst
Log:
fix some errors in debian pakages

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd_0.53-0rc1_all.deb
===================================================================
(Binary files differ)

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/create-personar-oppd-dpkg.sh
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/create-personar-oppd-dpkg.sh  
2011-08-10 07:45:26 UTC (rev 731)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/create-personar-oppd-dpkg.sh  
2011-08-30 13:49:50 UTC (rev 732)
@@ -11,6 +11,7 @@
 echo -e "\t\tcore\t do action for perfsonar-oppd";
 echo -e "\t\tbwctl\t do action for perfsonar-oppd-mp-bwctl";
 echo -e "\t\towamp\t do action for perfsonar-oppd-mp-owamp";
+echo -e "\t\thades\t do action for perfsonar-oppd-ma-hades";
 }
 
 

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postinst
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postinst  
      2011-08-10 07:45:26 UTC (rev 731)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postinst  
      2011-08-30 13:49:50 UTC (rev 732)
@@ -23,6 +23,7 @@
     chown root:root /etc/init.d/oppd
     chmod 755 /etc/init.d/oppd
     chown -R perfsonar:perfsonar /usr/lib/perfsonar/services/oppd
+    ln -s /usr/lib/perfsonar/services/oppd/bin/oppd.pl /usr/bin/
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postrm
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postrm  
2011-08-10 07:45:26 UTC (rev 731)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postrm  
2011-08-30 13:49:50 UTC (rev 732)
@@ -18,22 +18,17 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-
 case "$1" in
-    purge|abort-install)
-    #/usr/sbin/userdel perfsonar
+    remove|disappear)
+    rm /usr/bin/oppd.pl
+    /usr/sbin/userdel perfsonar
     #/usr/sbin/groupdel perfsonar
     ;;
 
-    remove|disappear)
+    purge|abort-install)
     ;;
 
     upgrade)
-    if which invoke-rc.d >/dev/null 2>&1; then
-       invoke-rc.d oppd start
-    else
-        /etc/init.d/oppd start
-    fi    
     ;;
 
     failed-upgrade|abort-upgrade)

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/preinst
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/preinst 
2011-08-10 07:45:26 UTC (rev 731)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/preinst 
2011-08-30 13:49:50 UTC (rev 732)
@@ -19,8 +19,8 @@
 # http://www.debian.org/doc/manuals/securing-debian-howto/ch9.en.html
 
 case "$1" in
-    install)
-       [ -z "$SERVER_HOME" ] && SERVER_HOME=/usr/lib/perfsonar
+    install|upgrade)
+       [ -z "$SERVER_HOME" ] && SERVER_HOME=/usr/lib/perfsonar/services/oppd
        [ -z "$SERVER_USER" ] && SERVER_USER=perfsonar
        [ -z "$SERVER_NAME" ] && SERVER_NAME="Open Perl perfSONAR Daemon"
        [ -z "$SERVER_GROUP" ] && SERVER_GROUP=perfsonar
@@ -42,42 +42,34 @@
                  $SERVER_USER 2>/dev/null || true
          echo "..done"
        fi
-       # 4. adjust passwd entry
+       #adjust passwd entry
        usermod -c "$SERVER_NAME" \
                -d $SERVER_HOME   \
                -g $SERVER_GROUP  \
                   $SERVER_USER
-       # 5. adjust file and directory permissions
-       if ! dpkg-statoverride --list $SERVER_HOME >/dev/null
-       then
-          #Check if directory exist
-          if [ ! -d $SERVER_HOME ];
-          then
-               mkdir -p $SERVER_HOME
-          fi
-          
-           chown -R $SERVER_USER:$SERVER_GROUP $SERVER_HOME
-           chmod u=rwx,g=rx,o=rx $SERVER_HOME
-       fi
-       ;;
-       configure)
-
-
-    #/usr/sbin/groupadd -f perfsonar
-    #/usr/sbin/useradd -g perfsonar -s /sbin/nologin -c "perfsonar user" -d 
/ perfsonar
-    #mkdir -p /usr/lib/perfsonar/services/oppd
-    #chown perfsonar:perfsonar /usr/lib/perfsonar/services/oppd
+       # adjust file and directory permissions
+       #Check if directory exist
+       if [ ! -d $SERVER_HOME ];
+      then
+           echo -n "Creatin the oppd directory"
+          mkdir -p $SERVER_HOME   
+           #chown -R $SERVER_USER:$SERVER_GROUP $SERVER_HOME
+           #chmod u=rwx,g=rx,o=rx $SERVER_HOME
+           echo "...done"
+      fi
+      ;;
+    configure)
     ;;
 
-    upgrade)
+   supgrade)
     #Check if oppd is running. If running stop it first
-    if ps ax | grep -v grep | grep oppd  > /dev/null; then
-    if which invoke-rc.d >/dev/null 2>&1; then
-        invoke-rc.d oppd stop
-    else
-        /etc/init.d/oppd stop
-    fi
-    fi
+    #if ps ax | grep -v grep | grep oppd  > /dev/null; then
+    #if which invoke-rc.d >/dev/null 2>&1; then
+    #    invoke-rc.d oppd stop
+    #else
+    #    /etc/init.d/oppd stop
+    #fi
+    #fi
     ;;
 
     abort-upgrade)