From 9f010a3b764823cba14f4d401d89844c2a796ed4 Mon Sep 17 00:00:00 2001
From: arifali <arifali@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 10 Apr 2012 10:28:30 +0000
Subject: [PATCH] xcat-ui: fixed debian files - don't need apachedaemon, as
 this is same across ubuntu and debian - added the plugins in the correct
 place - created the link for webportal

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12173 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-UI/debian/dirs     | 1 +
 xCAT-UI/debian/install  | 2 ++
 xCAT-UI/debian/links    | 2 ++
 xCAT-UI/debian/postinst | 8 ++++----
 xCAT-UI/debian/prerm    | 8 +++-----
 5 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 xCAT-UI/debian/links

diff --git a/xCAT-UI/debian/dirs b/xCAT-UI/debian/dirs
index b77ad3059..c3b9dcda6 100644
--- a/xCAT-UI/debian/dirs
+++ b/xCAT-UI/debian/dirs
@@ -1 +1,2 @@
 opt/xcat/ui
+opt/xcat/lib/perl/xCAT_plugin/
diff --git a/xCAT-UI/debian/install b/xCAT-UI/debian/install
index fe2a1d9c2..381506ea3 100644
--- a/xCAT-UI/debian/install
+++ b/xCAT-UI/debian/install
@@ -5,3 +5,5 @@ etc opt/xcat/ui/
 images opt/xcat/ui/
 js opt/xcat/ui/
 lib opt/xcat/ui/
+xcat/plugins/web.pm opt/xcat/lib/perl/xCAT_plugin
+xcat/plugins/webportal.pm opt/xcat/lib/perl/xCAT_plugin
diff --git a/xCAT-UI/debian/links b/xCAT-UI/debian/links
new file mode 100644
index 000000000..fe5104bc6
--- /dev/null
+++ b/xCAT-UI/debian/links
@@ -0,0 +1,2 @@
+#opt/xcat/ui/etc/apache2/conf.d/xcat-ui.conf etc/apache2/conf.d/xcat-ui.conf
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/webportal
diff --git a/xCAT-UI/debian/postinst b/xCAT-UI/debian/postinst
index 537e87de3..140259940 100644
--- a/xCAT-UI/debian/postinst
+++ b/xCAT-UI/debian/postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for openmpi
+# postinst script for xcat-ui
 #
 # see: dh_installdeb(1)
 
@@ -21,9 +21,9 @@ set -e
 case "$1" in
     configure)
         apachedaemon=apache2
-        /bin/rm -f /etc/$apachedaemon/conf.d/xcat-ui.conf
-        /bin/ln -s /opt/xcat/ui/etc/apache2/conf.d/xcat-ui.conf /etc/$apachedaemon/conf.d/xcat-ui.conf
-        /etc/init.d/$apachedaemon reload
+        /bin/rm -f /etc/apache2/conf.d/xcat-ui.conf
+        /bin/ln -s /opt/xcat/ui/etc/apache2/conf.d/xcat-ui.conf /etc/apache2/conf.d/xcat-ui.conf
+        /etc/init.d/apache2 restart
         # automatically put the encrypted passwd into the xcat passwd db
         /opt/xcat/sbin/chtab key=xcat,username=root passwd.password=`grep root /etc/shadow|cut -d : -f 2`
 
diff --git a/xCAT-UI/debian/prerm b/xCAT-UI/debian/prerm
index 5d63843a9..b0146377a 100644
--- a/xCAT-UI/debian/prerm
+++ b/xCAT-UI/debian/prerm
@@ -22,11 +22,9 @@ case "$1" in
     ;;
 
     remove)
-          apachedaemon=apache2
-
-          echo "Undoing $apachedaemon configuration for xCAT..."
-          /bin/rm -f /etc/$apachedaemon/conf.d/xcat-ui.conf
-          /etc/init.d/$apachedaemon reload
+          echo "Undoing apache2 configuration for xCAT..."
+          /bin/rm -f /etc/apache2/conf.d/xcat-ui.conf
+          /etc/init.d/apache2 restart
     ;;
 
     failed-upgrade)