X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=debian%2Fpostinst;fp=debian%2Fpostinst;h=f64830aabeaf9c79cf71d1f1371d44409f972357;hb=c1f1dc148eacf55a221fb2c4308e5ceebbece9ae;hp=db2cbc408a97694c0d74faf2d906cb2335f8d8f9;hpb=eca790a4b0339508b37841a5d4cb643d82a4d87b;p=squirrelmail-cn.git

diff --git a/debian/postinst b/debian/postinst
index db2cbc4..f64830a 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -64,7 +64,7 @@ listconffiles () {
 }
 
 
-reload=""
+need_restart=0
 DATE=`date +%Y-%m-%d.%H:%M:%S`
 CONFDIR=/etc/squirrelmail
 CONF=$CONFDIR/apache.conf
@@ -115,7 +115,7 @@ if [ -f "$CONF" ]; then
 		if ! cmp -s "$CONF" "/var/backups/$backup_name.bak"; then
 			echo "."
 			cp_echo "CN: Updated Apache2 configuration for Squirrelmail."
-			reload="reload"
+			need_restart=1
 		else
 			echo "... no changes."
 		fi
@@ -139,7 +139,7 @@ apache2squirrel=`ls -l /etc/apache2/conf.d/ | grep "$CONF"` || true
 
 if [ -z "$apache2listconf" -a -z "$apache2squirrel" ]; then
 	ln -s "$CONF" /etc/apache2/conf.d/squirrelmail-cn.conf
-	reload=reload
+	need_restart=1
 fi
 
 
@@ -196,58 +196,17 @@ fi
 # Would there be any changes, perhaps?
 #
 if cp_check_and_sed '.' "$seddef" "$CONF"; then
-	changed=1
+	need_restart=1
 fi
 
-if grep -q x62 "$CONF"; then
-	really_old_config=1
-fi
-
-
-#
-# MORE FIXES...
-#
 
-# Global $config_version;
+# Check /etc/hostname and /etc/mailname, because
+#   $domain = trim(implode('', file('/etc/'.(file_exists('/etc/mailname')?'mail':'host').'name')));
 #
-if ! egrep -q '^[ 	]*global[ 	]+\$config_version' "$CONF"; then
-	really_old_config=1
-	#echo "CN: Adding \"global \$config_version;\" to config.php."
-	perl -p -e 'print "global \$config_version;\n" if (/^\s*\$config_version/);' \
-		"$CONF" > "$CONF.tmp"
-	cp_mv "$CONF.tmp" "$CONF"
-fi
-
-# This was missing on some machines
-#
-if ! egrep -q '^[ 	]*\$allow_thread_sort' $CONF; then
-	to_add='\$allow_thread_sort = false;\n'
-	cp_echo "CN: Adding \"\$allow_thread_sort\"."
-	perl -p -e 'if (! $a && /^\s*\$edit_name/) {
-                 $_ .= "'"$to_add"'"; $a = 1; }
-              elsif (! $a && /^\?>/) {
-                 $_ = "'"$to_add"'" . $_; $a = 1; }' \
-	$CONF > "$CONF.tmp"
-	cp_mv "$CONF.tmp" "$CONF"
-fi
-
-# Shouldn't use /etc/hostname, especially if it contains only the host part
-# replace
-#   $domain = implode('', file('/etc/hostname'));
-# with
-#   $domain = trim(implode('',file('/etc/'.(file_exists('/etc/mailname')?'mail':'host').'name')));
-#
-if egrep -q "^[[:blank:]]*\\\$domain[[:blank:]]*=[[:blank:]]*implode\\('',[[:blank:]]*file\\('/etc/hostname'\\)\\);" $CONF; then
-	nodots=
-	nomailname=
-	grep -q '\.' /etc/hostname || nodots=1
-	[ -e /etc/mailname ] || nomailname=1
-	if cp_check_and_sed "^[[:blank:]]*\\\$domain[[:blank:]]*=[[:blank:]]*implode\\('',[[:blank:]]*file\\('/etc/hostname'\\)\\);" \
-                   "s|^[ \t]*\\\$domain[ \t]*=[ \t]*implode('',[ \t]*file('/etc/hostname'));|\$domain = trim(implode('',file('/etc/'.(file_exists('/etc/mailname')?'mail':'host').'name')));|" \
-                   $CONF; then
-		cp_echo "CN: config.php updated to use either /etc/mailname or /etc/hostname"
-	fi
-fi
+nodots=
+nomailname=
+grep -q '\.' /etc/hostname || nodots=1
+[ -e /etc/mailname ] || nomailname=1
 
 
 # Generate hr_HR locale if needed.
@@ -261,42 +220,25 @@ if ! egrep -q '^hr_HR ISO-8859-2\b' /etc/locale.gen; then
 		cp_echo "CN: /etc/locale.gen created."
 	fi
 	dpkg-reconfigure -f noninteractive locales
+	need_restart=1
 fi
 
 
-# Check Apache2 web server for restart/reload.
+# Check Apache2 web server for restart.
 #
-if [ -n "$reload" ]; then
+if [ $need_restart -eq 1 ]; then
 
 	# Restart Apache2 web server.
 	if [ -x "/etc/init.d/apache2" ]; then
 	        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-                    invoke-rc.d apache2 "$reload" || exit $?
+                    invoke-rc.d apache2 restart || exit $?
 	        else
-                    /etc/init.d/apache2 "$reload" || exit $?
+                    /etc/init.d/apache2 restart || exit $?
 	        fi
 	fi
 fi
 
 
-# Warn user of really old config file
-#
-if [ "$really_old_config" ]; then
-	echo
-	echo "CN: You have a really old config file."
-	cp_echo -m "CN: Old \"$CONF\" detected during installation."
-	cp_echo "CN  The known bad options were fixed, but it is _strongly_ recommended that"
-	cp_echo "CN  you either copy over the new template, and reconfigure this package"
-	cp_echo
-	cp_echo "    cp $TMPL $CONF"
-	cp_echo "    dpkg-reconfigure squirrelmail-cn"
-	cp_echo
-	cp_echo "CN  or use squirrelmail-configure (conf.pl) to generate a fresh"
-	cp_echo "    ${CONF} file."
-	echo
-fi
-
-
 # Mailname info...
 #
 if [ "$nodots" -o "$nomailname" ]; then