[Pkg-voip-commits] r2305 - op-panel/trunk/debian

[Alejandro Rios P.]

Author: alerios-guest
Date: 2006-08-24 16:34:07 +0000 (Thu, 24 Aug 2006)
New Revision: 2305

Modified:
   op-panel/trunk/debian/dirs
   op-panel/trunk/debian/postinst
Log:
* Applied patch from Diego Iastrubni <diego.iastrubni at xorcom.com> to improve postinst.


Modified: op-panel/trunk/debian/dirs
===================================================================
--- op-panel/trunk/debian/dirs	2006-08-24 16:27:20 UTC (rev 2304)
+++ op-panel/trunk/debian/dirs	2006-08-24 16:34:07 UTC (rev 2305)
@@ -1,2 +1,4 @@
-var/log/op-panel
+var/log/op-panel/
 usr/sbin/
+etc/op-panel/
+etc/asterisk/

Modified: op-panel/trunk/debian/postinst
===================================================================
--- op-panel/trunk/debian/postinst	2006-08-24 16:27:20 UTC (rev 2304)
+++ op-panel/trunk/debian/postinst	2006-08-24 16:34:07 UTC (rev 2305)
@@ -20,34 +20,22 @@
 case "$1" in
     configure)
 	touch /usr/share/op-panel/flash/variables.txt
-	if [ -a /etc/op-panel/op_server.cfg ]; then
-		cp -ba /etc/op-panel/op_server.cfg /etc/op-panel/op_server.cfg.old
-	fi
-	rm -f /etc/op-panel/op_server.cfg
-	if [ -a /etc/op-panel/op_buttons.cfg ]; then
-		cp -ba /etc/op-panel/op_buttons.cfg /etc/op-panel/op_buttons.cfg.old
-	fi
-	rm -f /etc/op-panel/op_buttons.cfg
-	if [ -a /etc/op-panel/op_style.cfg ]; then
-		cp -ba /etc/op-panel/op_style.cfg /etc/op-panel/op_style.cfg.old
-	fi
-	rm -f /etc/op-panel/op_style.cfg
-	if [ -a /etc/op-panel/op_astdb.cfg ]; then
-		cp -ba /etc/op-panel/op_astdb.cfg /etc/op-panel/op_astdb.cfg.old
-	fi
-	rm -f /etc/op-panel/op_astdb.cfg
-	update-alternatives --install /etc/op-panel/op_server.cfg op-panel \
-		/etc/op-panel/asternic/op_server.cfg 80 \
-		--slave /etc/op-panel/op_buttons.cfg op-buttons-cfg \
-		/etc/op-panel/asternic/op_buttons.cfg \
-		--slave /etc/op-panel/op_astdb.cfg op-astdb-cfg \
-		/etc/op-panel/asternic/op_astdb.cfg \
-		--slave /etc/op-panel/op_style.cfg op-style-cfg \
-		/etc/op-panel/asternic/op_style.cfg
-	ln -fs /etc/alternatives/op-panel /etc/op-panel/op_server.cfg
-	ln -fs /etc/alternatives/op-buttons-cfg /etc/op-panel/op_buttons.cfg
-	ln -fs /etc/alternatives/op-astdb-cfg /etc/op-panel/op_astdb.cfg
-	ln -fs /etc/alternatives/op-style-cfg /etc/op-panel/op_style.cfg
+	
+        for i in op_server op_buttons op_astdb op_style; do
+                if [ -a /etc/op-panel/$i.cfg ]; then
+                        cp -ba /etc/op-panel/$i.cfg /etc/op-panel/$i.old
+            		rm -f /etc/op-panel/$i.cfg
+                fi
+        done
+
+#       default configuration : asternic, priority 80
+        update-alternatives --install \
+                /etc/op-panel/op_server.cfg op-panel /etc/op-panel/asternic/op_server.cfg 80              \
+                --slave /etc/op-panel/op_buttons.cfg op-buttons-cfg /etc/op-panel/asternic/op_buttons.cfg \
+                --slave /etc/op-panel/op_astdb.cfg   op-astdb-cfg   /etc/op-panel/asternic/op_astdb.cfg   \
+                --slave /etc/op-panel/op_style.cfg   op-style-cfg   /etc/op-panel/asternic/op_style.cfg
+
+	/etc/init.d/op-panel restart
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)