X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=cd144c9d0cb9b8c6166b36d066e1ea9c38ba596d;hb=0e4d802d1434cc9b732a599cfb482e3acb05f508;hp=0b88b432ab2d9fc1c350b56727f4f239b1b052d7;hpb=c75107fd7e4c477c0b7910be102c0f8920881386;p=squirrelmail-change-pass-cn.git

diff --git a/debian/postinst b/debian/postinst
index 0b88b43..cd144c9 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -9,14 +9,33 @@ set -e
 . /usr/share/carnet-tools/functions.sh
 
 PKG="squirrelmail-change-pass-cn"
-VERSION="3.0.2"
+VERSION="3.1.4.1"
 SQCONFDIR="/etc/squirrelmail"
 SQCONF="$SQCONFDIR/config.php"
-SQCPCONF="$SQCONFDIR/config_change_pass.php"
-CPCONF="/usr/share/squirrelmail/plugins/change_pass/config.php"
 need_restart=0
 
 
+# chk_conf_tag ()
+#
+#   Check if configuration file has CARNet package info lines.
+#   return:  $RET => 0 - tagged
+#                    1 - file does not exists
+#                    2 - file exists, but it is not tagged
+#
+chk_conf_tag () {
+    local conf_file
+    conf_file="$1"
+    RET=1
+
+    if [ -f "$conf_file" ]; then
+        if egrep -q "^## Begin - Generated by CARNet package ${PKG}$" "$conf_file"; then
+            RET=0
+        else
+            RET=2
+        fi
+    fi
+}
+
 # Configure poppassd to refuse connection from all hosts
 # but localhost (127.0.0.1).
 #
@@ -34,52 +53,43 @@ if ! egrep -q '^poppassd:' /etc/hosts.allow; then
 fi
 
 
-# First of all, do the backup.
-#
-done_backup=0
-for cpconf_file in $SQCPCONF $CPCONF; do
-    if [ -f "$cpconf_file" ] && [ ! -L "$cpconf_file" ]; then
-        cp_echo "CN: Doing backup for $cpconf_file"
-        cp_backup_conffile -d "/var/backups/$PKG" -p $cpconf_file
-        done_backup=1
-    fi
-done
-if [ $done_backup -eq 1 ]; then
-    cp_echo "CN: Backup is located in directory: /var/backups/$PKG/"
-fi
-
-
 # Enable change_pass plugin in SquirrelMail config.php.
 #
 if ! egrep -q '^\$plugins\[[0-9]+\][\ ]*=[\ ]*'\''change_pass'\' "$SQCONF"; then
-    /usr/sbin/squirrelmail-configure --install-plugin change_pass
+    squirrelmail-configure --install-plugin change_pass
 fi
 
 
 # Convert poppassd service from inetd.conf to xinetd.conf type.
 # Service configuration is saved in /etc/xinetd.d/ directory.
 #
-if [ -x /etc/init.d/xinetd -a -d /etc/xinetd.d -a -x /usr/sbin/itox ]; then
-
-    if egrep -q '^poppassd' /etc/inetd.conf && \
-        [ ! -f /etc/xinetd.d/poppassd ]; then
+chk_conf_tag /etc/xinetd.d/poppassd
+if [ $RET -lt 2 ]; then
+    cp_echo "CN: Enabling poppassd in /etc/xinetd.d/poppassd"
 
-        cp_echo "CN: Enabling poppassd in /etc/xinetd.d/poppassd"
-
-        touch /etc/xinetd.d/poppassd.$$
-        grep "^poppassd" /etc/inetd.conf  | \
-            itox -daemon_dir /usr/sbin | cp-update "$PKG" /etc/xinetd.d/poppassd.$$
-        cp_mv /etc/xinetd.d/poppassd.$$ /etc/xinetd.d/poppassd
-
-        need_restart=1
+    if [ ! -d /etc/xinetd.d ]; then
+        mkdir -p /etc/xinetd.d/
     fi
+    touch /etc/xinetd.d/poppassd.$$
+    cp-update "$PKG" /etc/xinetd.d/poppassd.$$ <<EOF
+service poppassd
+{
+	socket_type     = stream
+	protocol        = tcp
+	wait            = no
+	user            = root
+	server          = /usr/sbin/poppassd
+}
+EOF
+    cp_mv /etc/xinetd.d/poppassd.$$ /etc/xinetd.d/poppassd
+
+    need_restart=1
 fi
 
 
 # Restart xinetd if needed.
 #
 if [ $need_restart -eq 1 ]; then
-
     if [ -x "/etc/init.d/xinetd" ]; then
         if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
             invoke-rc.d xinetd restart || exit $?