X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;fp=debian%2Fpostinst;h=086cc7570c45928d6366efc9d4015fdab6811202;hb=d03328f5a691130af6d00a90401854ec1dbca134;hp=e9923d78c9219196743c63d455127a9b7356f805;hpb=233a4144ba7f128474b9eb63767276ae84ade801;p=apache2-cn.git

diff --git a/debian/postinst b/debian/postinst
index e9923d7..086cc75 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -137,6 +137,9 @@ conf_log_fix () {
 		    $conf_file > $out
 		mv $out $conf_file
 	    fi
+	    
+	    # Be sure..
+	    chmod 644 $conf_file
 	fi
 }
 
@@ -156,15 +159,20 @@ generate_ssl () {
 #   Check if port 443 is configured in ports.conf file.
 #
 listen_ssl() {
-	
-	if ! egrep -iq "^[[:space:]]*Listen[[:space:]]*.*443$" "$PORTCONF"; then
+
+	if [ ! -f "$PORTCONF" ] || ! egrep -iq "^[[:space:]]*Listen[[:space:]]*.*443$" "$PORTCONF"; then
 	
 		cp_echo "CN: Enabling SSL port (443) for Apache2 web server."
 
 		out=$(mktemp ${PORTCONF}.XXXXXX)
-		cp $PORTCONF $out
+		
+		if [ -f "$PORTCONF" ]; then
+			cp $PORTCONF $out
+		fi
+		
 		echo "Listen 443" >> $out
 		cp_mv $out $PORTCONF
+		chmod 644 $PORTCONF
 		
 		need_restart=1
 		temp_files="${temp_files} ${out}"
@@ -311,13 +319,14 @@ trap cleanup 0 1 2 15
 
 
 # Make sure that monit conf for Apache is disabled.
+#
 if [ -f "/etc/monit.d/apache1.conf" ]; then
 	mv /etc/monit.d/apache1.conf /etc/monit.d/apache1.conf.disabled
 	pkill -9 -f /usr/sbin/monit || true
 fi
 
 
-# First of all - stop Apache web server, make sure Apache is NOT running.
+# Make sure Apache is NOT running.
 #
 if [ -x /usr/sbin/invoke-rc.d ]; then
 	[ -x /usr/sbin/apache ] && invoke-rc.d apache stop || true