X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=936c7aa4a6cdb0c2bcaa581d0af7655a9b874a53;hb=9cd42e4576595fed873d7bb785638fbc71c16ed9;hp=26a3e5f080277fba4862eb7754344aaeca3f5fab;hpb=de39535cd06585d6895fb78304d45c4f83d04273;p=php4-cn.git

diff --git a/debian/postinst b/debian/postinst
index 26a3e5f..936c7aa 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -51,6 +51,20 @@ phpmemlimit () {
     echo $memlimit
 }
 
+# phpinivalidate ()
+#
+#   Validate php.ini values.
+#
+phpinivalidate () {
+
+    local ini_file
+    ini_file="$1"
+
+    awk -F'[[:space:]]*=[[:space:]]*' \
+	'/^[[:space:]]*[[:alpha:]_]+[[:space:]]*=[[:space:]]*[[:digit:]]+[MGK]B/ {print $1" = "$2}' \
+	"$ini_file"
+}
+
 
 # Disable PHP5 module and enable Apache2 PHP4 module.
 #
@@ -96,6 +110,7 @@ for SAPI in apache2 cli; do
 		cp_mv $ini_file_tmp $ini_file
 		need_restart=1
 	fi
+	chmod 644 $ini_file
 done
 
 
@@ -139,7 +154,7 @@ for php4ext in $EXTENSIONS; do
 
 		cp_echo "CN: Adding $php4ext extension to file $PHP4CONFD/$php4ext.ini"
 		
-		echo -e "# configuration for php $php4ext_up module\nextension=$php4ext.so" >> "$INITMP"
+		printf "# configuration for php %s module\nextension=%s.so\n" "${php4ext_up}" "${php4ext}" >> "$INITMP"
 		cp_mv "$INITMP" "$PHP4CONFD/$php4ext.ini"
 		
 		need_restart=1
@@ -157,6 +172,7 @@ for php4ext in $EXTENSIONS; do
 			need_restart=1
 		fi
 	fi
+	chmod 644 $PHP4CONFD/$php4ext.ini
 done
 
 
@@ -172,11 +188,10 @@ for SAPI in apache2 cli; do
 		continue
 	fi
 
+	ini_file="$PHP4DIR/$SAPI/php.ini"
 	db_get php4-cn/${SAPI} || true
 	if [ "$RET" = "true" ]; then
 	
-	    ini_file="$PHP4DIR/$SAPI/php.ini"
-
 	    cp_echo "CN: Checking and enabling some specific parameters in file $ini_file"
 	
 	    phplimit="$(phpmemlimit)M"
@@ -214,11 +229,25 @@ for SAPI in apache2 cli; do
 		need_restart=1
 	    fi
 	    cp_mv "$ini_file_tmp" "$ini_file"
+	    chmod 644 "$ini_file"
 
 	    if [ -e "$ini_file_tmp" ]; then
 		rm -f "$ini_file_tmp"
 	    fi
 	fi
+
+	# Validate php.ini values.
+	if [ -f "$ini_file" ]; then
+		php4_inivalues="$(phpinivalidate "$ini_file")"
+		if [ -n "$php4_inivalues" ]; then
+			db_title php4-cn - konfiguracija za $(echo ${SAPI} | sed 's/a/A/;s/cli/CLI/')
+			db_subst php4-cn/inivalues php4_sapi $(echo ${SAPI} | sed 's/a/A/;s/cli/CLI/')
+			db_subst php4-cn/inivalues ini_file "$ini_file"
+			db_subst php4-cn/inivalues php4_inivalues "$(echo -n "$php4_inivalues" | debconf-escape -e)"
+			db_input critical php4-cn/inivalues || true
+			db_go || true
+		fi
+	fi
 done