X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=26cec9de6e499fa8bff20be1be11a9a7ebe259f9;hb=6b158470473a22455a0bff0d7a66741bd9aedd1e;hp=f9a78dc8dfb648ea4670f66269b25158768e5dc8;hpb=bd7b89019cd11f2ff6d8a119e412ccfa6304a20f;p=php5-cn.git

diff --git a/debian/postinst b/debian/postinst
index f9a78dc..26cec9d 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -28,8 +28,11 @@ esac
 
 PKG="php5-cn"
 A2MODEDIR="/etc/apache2/mods-enabled"
-EXTENSIONS="mysql"
+### mysql je vec ukljucen u wheezyu
+### EXTENSIONS="mysql"
+EXTENSIONS=""
 PHP5DIR="/etc/php5"
+PHP5MODADIR="$PHP5DIR/mods-available"
 PHP5CONFD="/etc/php5/conf.d"
 PHP4DIR="/etc/php4"
 
@@ -78,6 +81,17 @@ if [ -e /etc/apache2/apache2.conf ]; then
     if [ ! -e "$A2MODEDIR/php5.load" ] || [ ! -e "$A2MODEDIR/php5.conf" ]; then
         cp_echo "CN: Enabling PHP5 module for Apache2 web server"
         a2enmod php5 >/dev/null || true
+
+        if [ -e "$A2MODEDIR/php5.conf" ]; then
+            if egrep -qi "^[[:space:]]*php_admin_value engine Off" "$A2MODEDIR/php5.conf"; then
+                db_fset php5-cn/userdir seen false
+                db_title php5-cn - konfiguracija
+                db_subst php5-cn/userdir php5_conf "$A2MODEDIR/php5.conf"
+                db_input critical php5-cn/userdir || true
+                db_go || true
+            fi
+        fi
+
         need_restart=1
     fi
 fi
@@ -100,12 +114,12 @@ for SAPI in apache2 cli; do
 
         ini_file_tmp=`mktemp $ini_file.tmp.XXXXXX`
         if [ "$SAPI" = "cli" ]; then
-            if [ -f "/usr/share/php5/php.ini-dist.cli" ]; then
-                cat /usr/share/php5/php.ini-dist.cli > $ini_file_tmp
+            if [ -f "/usr/share/php5/php.ini-production.cli" ]; then
+                cat /usr/share/php5/php.ini-production.cli > $ini_file_tmp
             fi
         else
-            if [ -f "/usr/share/php5/php.ini-dist" ]; then
-                cat /usr/share/php5/php.ini-dist > $ini_file_tmp
+            if [ -f "/usr/share/php5/php.ini-production" ]; then
+                cat /usr/share/php5/php.ini-production > $ini_file_tmp
             fi
         fi
         cp_mv $ini_file_tmp $ini_file
@@ -122,6 +136,17 @@ if [ ! -d "$PHP5CONFD" ]; then
     mkdir -p $PHP5CONFD/
 fi
 
+# Brisanje obsolete datoteke mysql.ini u $PHP5CONFD
+#
+if [ -f "$PHP5CONFD/mysql.ini" ]; then
+	# just to make sure mysql is included in _new-style_ configuration
+	if [ -f "$PHP5MODADIR/mysql.ini" ]; then
+		cp_echo "CN: Removing obsolete $PHP5CONFD/mysql.ini"
+		rm -f $PHP5CONFD/mysql.ini
+	else
+		cp_echo "CN: WARNING: Obsolete $PHP5CONFD/mysql.ini present, and no $PHP5MODADIR/mysql.ini!"
+	fi
+fi
 
 # Check if PHP5 extensions are enabled.
 #
@@ -184,6 +209,7 @@ done
 #   * upload_max_filesize = 256M
 #   * post_max_size, memory_limit = depends on system memory, we are using
 #     phpmemlimit() function.
+#   * error_reporting = E_ERROR
 #
 for SAPI in apache2 cli; do
 
@@ -212,6 +238,10 @@ for SAPI in apache2 cli; do
             cp_check_and_sed "^[[:space:]]*memory_limit[[:space:]]*=" \
                 "s/^[[:space:]]*memory_limit[[:space:]]*=.*/memory_limit = ${phplimit}/" \
                 "$ini_file" && need_restart=1 || true
+
+            cp_check_and_sed "^[[:space:]]*error_reporting[[:space:]]*=" \
+                "s/^[[:space:]]*error_reporting[[:space:]]*=.*/error_reporting = E_ERROR/" \
+                "$ini_file" && need_restart=1 || true
         fi
 
         ini_file_tmp=`mktemp $ini_file.tmp.XXXXXX`
@@ -231,6 +261,10 @@ for SAPI in apache2 cli; do
             echo "memory_limit = ${phplimit}" >> "$ini_file_tmp"
             need_restart=1
         fi
+        if ! egrep -q "^[[:space:]]*error_reporting[[:space:]]*=" $ini_file_tmp; then
+            echo "error_reporting = E_ERROR" >> "$ini_file_tmp"
+            need_restart=1
+        fi
         cp_mv "$ini_file_tmp" "$ini_file"
         chmod 644 "$ini_file"