X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=apache2-cn.git;a=blobdiff_plain;f=debian%2Fpostinst;h=907be26fc3ef74856c19534a292368ec049aeb14;hp=41a96aa85d262122c23fc818c895f05a0202e498;hb=5a453dc81e5301d37919a4d4394666a18d4c26ad;hpb=3856ea6e5dfd3b51301b2e52bffb1c0557dbdeb7

diff --git a/debian/postinst b/debian/postinst
index 41a96aa..907be26 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -8,18 +8,18 @@ set -e
 . /usr/share/debconf/confmodule
 
 case "$1" in
-	configure)
-		# continue below
-		;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
-		exit 0
-		;;
-
-	*)
-		echo "postinst called with unknown argument \`$1'" >&2
-		exit 0
-		;;
+    configure)
+        # continue below
+        ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+        exit 0
+        ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+        ;;
 esac
 
 
@@ -27,7 +27,7 @@ esac
 . /usr/share/carnet-tools/functions.sh
 
 PKG="apache2-cn"
-VERSION="2.2-5lenny1"
+VERSION="2.2+1"
 CONFDIR="/etc/apache2"
 CONF="$CONFDIR/apache2.conf"
 A2MODEDIR="$CONFDIR/mods-enabled"
@@ -60,14 +60,13 @@ listen_ssl_mask=
 #   Cleanup all temp files.
 #
 cleanup () {
-
-	if [ -n "$temp_files" ]; then
-		for item in $temp_files; do
-			if [ -e "$item" ]; then
-				rm -f $item
-			fi
-		done
-	fi
+    if [ -n "$temp_files" ]; then
+        for item in $temp_files; do
+            if [ -e "$item" ]; then
+                rm -f $item
+            fi
+        done
+    fi
 }
 
 # tag_conf()
@@ -75,13 +74,11 @@ cleanup () {
 #   Add CARNet package info lines to config's header.
 #
 tag_conf () {
-	
-	local conf_file
-	conf_file="$1"
-	
-	if [ -e "$conf_file" ]; then
-	
-		cat >> $conf_file <<EOF
+    local conf_file
+    conf_file="$1"
+
+    if [ -e "$conf_file" ]; then
+        cat >> $conf_file <<EOF
 ## Begin - Generated by CARNet package apache2-cn
 #
 #  REMOVE this whole block if you DON'T WANT apache2-cn
@@ -89,7 +86,7 @@ tag_conf () {
 #
 ## End - Generated by CARNet package apache2-cn
 EOF
-	fi
+    fi
 }
 
 # chk_conf_tag ()
@@ -100,18 +97,17 @@ EOF
 #                    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 apache2-cn$" "$conf_file"; then
-			RET=0
-		else
-			RET=2
-		fi
-	fi
+    local conf_file
+    conf_file="$1"
+    RET=1
+
+    if [ -f "$conf_file" ]; then
+        if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" "$conf_file"; then
+            RET=0
+        else
+            RET=2
+        fi
+    fi
 }
 
 # generate_ssl()
@@ -119,10 +115,9 @@ chk_conf_tag () {
 #   Generate Apache2 web server SSL certificate.
 #
 generate_ssl () {
-
-	generate_ssl_output=$($A2CNDIR/carnet-generate-ssl ignore "$FQDN" "$WEBMASTER" "$DOMAIN" 2> /dev/null)
-	cp_echo "$generate_ssl_output"
-	need_restart=1
+    generate_ssl_output=$($A2CNDIR/carnet-generate-ssl ignore "$FQDN" "$WEBMASTER" "$DOMAIN" 2> /dev/null)
+    cp_echo "$generate_ssl_output"
+    need_restart=1
 }
 
 # listen_ssl()
@@ -131,23 +126,23 @@ generate_ssl () {
 #
 listen_ssl() {
 
-	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)
-		
-		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}"
-	fi
+    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)
+
+        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}"
+    fi
 }
 
 # install_conf()
@@ -155,19 +150,18 @@ listen_ssl() {
 #   Install specified Apache2 configuration file.
 #
 install_conf() {
+    conftmpl="$A2CNDIR/$1.conf"
+    conf="$CONFDIR/conf.d/$2.conf"
 
-	conftmpl="$A2CNDIR/$1.conf"
-	conf="$CONFDIR/conf.d/$2.conf"
-
-	if [ ! -e "$conf" ]; then
-	
-		cp_echo "CN: Enabling CARNet specific configuration."
-		cp "$conftmpl" "$conf"
-		
-		need_restart=1
-	else
-		cp_echo "CN: $conf already exists, left untouched." 1>&2
-	fi
+    if [ ! -e "$conf" ]; then
+
+        cp_echo "CN: Enabling CARNet specific configuration."
+        cp "$conftmpl" "$conf"
+
+        need_restart=1
+    else
+        cp_echo "CN: $conf already exists, left untouched." 1>&2
+    fi
 }
 
 # install_vhost()
@@ -188,99 +182,98 @@ install_conf() {
 #   site-enabled-symlink - name of symlink in sites-enabled
 #
 install_vhost() {
+    add_namevirthost=
+    mkdir_docroot=
+    symlink_docroot=
+    docroot=
+    vhostname=
+
+    while echo "x$1" | grep -q '^x-'; do
+        case "$1" in
+            -nvh)
+                add_namevirthost=1
+                shift
+                ;;
+            -d)
+                mkdir_docroot=1
+                shift
+                ;;
+            -s)
+                shift
+                symlink_docroot="$1"
+                shift
+                ;;
+            -r)
+                shift
+                docroot="$1"
+                if ! echo "$docroot" | grep -q /; then
+                    docroot="/var/www/$docroot"
+                fi
+                shift
+                ;;
+            -n)
+                shift
+                vhostname="$1"
+                shift
+                ;;
+        esac
+    done
+
+    vhosttmpl="$1.template"
+    vhost="$2"
+    venabled="$3"
+    [ -z "$vhostname" ] && vhostname=$(echo "$vhost"| awk -F. '{print $1}')
+    force_vhost=
+
+    vhostdir=$CONFDIR/sites-available
+    venabledir=$CONFDIR/sites-enabled
+
+    if [ ! -e "$TMPLDIR/${vhosttmpl}" ]; then
+        echo "E: vhost template ${vhosttmpl} not found in $TMPLDIR!" 1>&2
+        exit 2
+    fi
+
+    [ -z "$docroot" ] && docroot="/var/www/$vhostname.$DOMAIN"
+
+    # if we were broken mid-installation, force
+    if [ ! -e "$docroot" -a \( -n "$mkdir_docroot" -o -n "$symlink_docroot" \) ]; then
+        force_vhost=1
+    fi
+
+    # add vhost if either of these is true
+    # - adding is forced OR
+    # - it doesn't exist
+    #
+    if [ -n "$force_vhost" -o \( ! -e "$vhostdir/$vhost" -a ! -e "$venabledir/$venabled" \) ]; then
+
+        cp_echo "CN: Adding $vhost VirtualHost."
+        out=$(mktemp $vhostdir/$vhost.XXXXXX)
+        temp_files="${temp_files} ${out}"
+
+        # CARNet header.
+        tag_conf "$out"
+
+        if [ "$add_namevirthost" ]; then
+            nvh=$(awk -F'[ >]' '/^<VirtualHost/ {print $2}' $TMPLDIR/$vhosttmpl |\
+                sed "s/IPADDR/$MYIP/g")
+            echo "NameVirtualHost $nvh" >> $out
+        fi
 
-	add_namevirthost=
-	mkdir_docroot=
-	symlink_docroot=
-	docroot=
-	vhostname=
-  
-	while echo "x$1" | grep -q '^x-'; do
-	    case "$1" in
-		-nvh)
-		    add_namevirthost=1
-		    shift
-		    ;;
-		-d)
-		    mkdir_docroot=1
-		    shift
-		    ;;
-		-s)
-		    shift
-		    symlink_docroot="$1"
-		    shift
-		    ;;
-		-r)
-		    shift
-		    docroot="$1"
-		    if ! echo "$docroot" | grep -q /; then
-			    docroot="/var/www/$docroot"
-		    fi
-		    shift
-		    ;;
-		-n)
-		    shift
-		    vhostname="$1"
-		    shift
-		    ;;
-	    esac
-	done
-
-	vhosttmpl="$1.template"
-	vhost="$2"
-	venabled="$3"
-	[ -z "$vhostname" ] && vhostname=$(echo "$vhost"| awk -F. '{print $1}')
-	force_vhost=
-
-	vhostdir=$CONFDIR/sites-available
-	venabledir=$CONFDIR/sites-enabled
-
-	if [ ! -e "$TMPLDIR/${vhosttmpl}" ]; then
-		echo "E: vhost template ${vhosttmpl} not found in $TMPLDIR!" 1>&2
-		exit 2
-	fi
-
-	[ -z "$docroot" ] && docroot="/var/www/$vhostname.$DOMAIN"
-  
-	# if we were broken mid-installation, force
-	if [ ! -e "$docroot" -a \( -n "$mkdir_docroot" -o -n "$symlink_docroot" \) ]; then
-		force_vhost=1
-	fi
-  
-	# add vhost if either of these is true
-	# - adding is forced OR
-	# - it doesn't exist
-	#
-	if [ -n "$force_vhost" -o \( ! -e "$vhostdir/$vhost" -a ! -e "$venabledir/$venabled" \) ]; then
-	
-		cp_echo "CN: Adding $vhost VirtualHost."
-		out=$(mktemp $vhostdir/$vhost.XXXXXX)
-		temp_files="${temp_files} ${out}"
-		
-		# CARNet header.
-		tag_conf "$out"
-
-		if [ "$add_namevirthost" ]; then
-		        nvh=$(awk -F'[ >]' '/^<VirtualHost/ {print $2}' $TMPLDIR/$vhosttmpl |\
-	    		    sed "s/IPADDR/$MYIP/g")
-			echo "NameVirtualHost $nvh" >> $out
-		fi
-    
-	        sed "s/HOST/$vhostname/g; s/DOMAIN/$DOMAIN/g;
-	             s#DOCROOT#$docroot#g; s/IPADDR/$MYIP/g" < $TMPLDIR/$vhosttmpl >> $out
-	        cp_mv $out $vhostdir/$vhost
-	        chmod 644 $vhostdir/$vhost
-	        ln -fs ../sites-available/$vhost $venabledir/$venabled    
-    
-		if [ -n "$mkdir_docroot" -a ! -d "$docroot" ]; then
-			mkdir "$docroot"
-			echo '<html><body><h1>Radi!</h1></body></html>' > "$docroot/index.html"
-		elif [ -n "$symlink_docroot" ]; then
-			ln -fs "$symlink_docroot" "$docroot"
-		fi
-
-		need_restart=1
-	fi
+        sed "s/HOST/$vhostname/g; s/DOMAIN/$DOMAIN/g;
+            s#DOCROOT#$docroot#g; s/IPADDR/$MYIP/g" < $TMPLDIR/$vhosttmpl >> $out
+        cp_mv $out $vhostdir/$vhost
+        chmod 644 $vhostdir/$vhost
+        ln -fs ../sites-available/$vhost $venabledir/$venabled
+
+        if [ -n "$mkdir_docroot" -a ! -d "$docroot" ]; then
+            mkdir "$docroot"
+            echo '<html><body><h1>Radi!</h1></body></html>' > "$docroot/index.html"
+        elif [ -n "$symlink_docroot" ]; then
+            ln -fs "$symlink_docroot" "$docroot"
+        fi
+
+        need_restart=1
+    fi
 }
 
 
@@ -293,30 +286,30 @@ trap cleanup 0 1 2 15
 # /etc/apache2/sites-available/ directories.
 #
 if [ -e "$CONF" ]; then
-	cp_echo "CN: Doing backup for $CONF"
-	cp_backup_conffile -d $BACKUPDIR -p $CONF
-	backup_done=1
+    cp_echo "CN: Doing backup for $CONF"
+    cp_backup_conffile -d $BACKUPDIR -p $CONF
+    backup_done=1
 fi
 if [ -d "$CONFDIR/conf.d" ] && [ -n "$(ls ${CONFDIR}/conf.d/)" ]; then
-	cp_echo "CN: Doing backup for all files in /etc/apache2/conf.d/"
-	for file in /etc/apache2/conf.d/*; do
-	    if [ -z "$(echo $file | egrep '^/.*~')" ]; then
-		cp_backup_conffile -d $BACKUPDIR -p $file
-	    fi
-	done
-	backup_done=1
+    cp_echo "CN: Doing backup for all files in /etc/apache2/conf.d/"
+    for file in /etc/apache2/conf.d/*; do
+        if [ -z "$(echo $file | egrep '^/.*~')" ]; then
+            cp_backup_conffile -d $BACKUPDIR -p $file
+        fi
+    done
+    backup_done=1
 fi
 if [ -d "$CONFDIR/sites-available" ] && [ -n "$(ls ${CONFDIR}/sites-available/)" ]; then
-	cp_echo "CN: Doing backup for all files in /etc/apache2/sites-available/"
-	for file in /etc/apache2/sites-available/*; do
-	    if [ -z "$(echo $file | egrep '^/.*~')" ]; then
-		cp_backup_conffile -d $BACKUPDIR -p $file
-	    fi
-	done
-	backup_done=1
+    cp_echo "CN: Doing backup for all files in /etc/apache2/sites-available/"
+    for file in /etc/apache2/sites-available/*; do
+        if [ -z "$(echo $file | egrep '^/.*~')" ]; then
+            cp_backup_conffile -d $BACKUPDIR -p $file
+        fi
+    done
+    backup_done=1
 fi
 if [ $backup_done -eq 1 ]; then
-	cp_echo "CN: Backup is located in directory: $BACKUPDIR/"
+    cp_echo "CN: Backup is located in directory: $BACKUPDIR/"
 fi
 
 
@@ -324,43 +317,43 @@ fi
 #
 if [ -e "$CONF" ]; then
 
-	if [ ! -e "$A2MODEDIR/cgi.load" ]; then
-		cp_echo "CN: Enabling CGI module for Apache2 web server."
-		a2enmod cgi >/dev/null || true
-		need_restart=1
-	fi
-
-	if [ ! -e "$A2MODEDIR/rewrite.load" ]; then
-		cp_echo "CN: Enabling rewrite module for Apache2 web server."
-		a2enmod rewrite >/dev/null || true
-		need_restart=1
-	fi
-
-	if [ ! -e "$A2MODEDIR/userdir.load" ] || [ ! -e "$A2MODEDIR/userdir.conf" ]; then
-		cp_echo "CN: Enabling userdir module for Apache2 web server."
-		a2enmod userdir >/dev/null || true
-		need_restart=1
-	fi
-
-	if [ ! -e "$A2MODEDIR/suexec.load" ]; then
-		cp_echo "CN: Enabling SUEXEC module for Apache2 web server."
-		a2enmod suexec >/dev/null || true
-		need_restart=1
-	fi
-
-	if [ ! -e "$A2MODEDIR/php5.load" ] || [ ! -e "$A2MODEDIR/php5.conf" ]; then
-	    if [ -e "/usr/lib/apache2/modules/libphp5.so" ]; then
-		cp_echo "CN: Enabling PHP5 module for Apache2 web server."
-		a2enmod php5 >/dev/null || true
-		need_restart=1
-	    fi
-	fi
-
-	if [ ! -e "$A2MODEDIR/ssl.load" ] || [ ! -e "$A2MODEDIR/ssl.conf" ]; then
-		cp_echo "CN: Enabling SSL module for Apache2 web server."
-		a2enmod ssl >/dev/null || true
-		need_restart=1
-	fi
+    if [ ! -e "$A2MODEDIR/cgi.load" ]; then
+        cp_echo "CN: Enabling CGI module for Apache2 web server."
+        a2enmod cgi >/dev/null || true
+        need_restart=1
+    fi
+
+    if [ ! -e "$A2MODEDIR/rewrite.load" ]; then
+        cp_echo "CN: Enabling rewrite module for Apache2 web server."
+        a2enmod rewrite >/dev/null || true
+        need_restart=1
+    fi
+
+    if [ ! -e "$A2MODEDIR/userdir.load" ] || [ ! -e "$A2MODEDIR/userdir.conf" ]; then
+        cp_echo "CN: Enabling userdir module for Apache2 web server."
+        a2enmod userdir >/dev/null || true
+        need_restart=1
+    fi
+
+    if [ ! -e "$A2MODEDIR/suexec.load" ]; then
+        cp_echo "CN: Enabling SUEXEC module for Apache2 web server."
+        a2enmod suexec >/dev/null || true
+        need_restart=1
+    fi
+
+    if [ ! -e "$A2MODEDIR/php5.load" ] || [ ! -e "$A2MODEDIR/php5.conf" ]; then
+        if [ -e "/usr/lib/apache2/modules/libphp5.so" ]; then
+            cp_echo "CN: Enabling PHP5 module for Apache2 web server."
+            a2enmod php5 >/dev/null || true
+            need_restart=1
+        fi
+    fi
+
+    if [ ! -e "$A2MODEDIR/ssl.load" ] || [ ! -e "$A2MODEDIR/ssl.conf" ]; then
+        cp_echo "CN: Enabling SSL module for Apache2 web server."
+        a2enmod ssl >/dev/null || true
+        need_restart=1
+    fi
 fi
 
 
@@ -375,12 +368,12 @@ listen_ssl
 # Disable default site configuration.
 #
 if [ -e "$CONF" ]; then
-	if [ -e "$CONFDIR/sites-enabled/000-default" ]; then
-		cp_echo "CN: Disabling 000-default site configuration."
-		a2dissite 000-default >/dev/null || true
+    if [ -e "$CONFDIR/sites-enabled/000-default" ]; then
+        cp_echo "CN: Disabling 000-default site configuration."
+        a2dissite 000-default >/dev/null || true
 
-		need_restart=1
-	fi
+        need_restart=1
+    fi
 fi
 
 
@@ -389,45 +382,45 @@ fi
 has_listen_ssl=0
 
 if [ -d "$CONFDIR/conf.d" ] && [ -n "$(ls $CONFDIR/conf.d)" ]; then
-	listen_ssl_mask=$CONFDIR/conf.d/*
+    listen_ssl_mask=$CONFDIR/conf.d/*
 fi
 if [ -d "$CONFDIR/sites-enabled" ] && [ -n "$(ls $CONFDIR/sites-enabled)" ]; then
-	listen_ssl_mask=$listen_ssl_mask" "$CONFDIR/sites-enabled/*
+    listen_ssl_mask=$listen_ssl_mask" "$CONFDIR/sites-enabled/*
 fi
 
 for file in $CONF $listen_ssl_mask; do
-	if [ -f "$file" ]; then
-		if egrep -iq '^[[:space:]]*<VirtualHost .*443[[:space:]]*>' $file; then
-			has_listen_ssl=1
-			apache2_sslcert=1
-			break
-		fi
-	fi
+    if [ -f "$file" ]; then
+        if egrep -iq '^[[:space:]]*<VirtualHost .*443[[:space:]]*>' $file; then
+            has_listen_ssl=1
+            apache2_sslcert=1
+            break
+        fi
+    fi
 done
 
 if [ $apache2_sslcert -eq 0 ]; then
 
-	db_get apache2-cn/sslcf || true
-	apache2_sslcf="$RET"
+    db_get apache2-cn/sslcf || true
+    apache2_sslcf="$RET"
+
+    if [ -n "$apache2_sslcf" ]; then
 
-	if [ -n "$apache2_sslcf" ]; then
+        db_get apache2-cn/sslckf || true
+        apache2_sslckf="$RET"
 
-		db_get apache2-cn/sslckf || true
-		apache2_sslckf="$RET"
+        db_get apache2-cn/sslccf || true
+        apache2_sslccf="$RET"
 
-		db_get apache2-cn/sslccf || true
-		apache2_sslccf="$RET"
-	
-		need_restart=1
-	else
+        need_restart=1
+    else
 
-		# Generate new SSL certificate files.
-		generate_ssl
-	
-		apache2_sslcf=
-		apache2_sslckf=
-		apache2_sslccf=
-	fi
+        # Generate new SSL certificate files.
+        generate_ssl
+
+        apache2_sslcf=
+        apache2_sslckf=
+        apache2_sslccf=
+    fi
 fi
 
 
@@ -439,45 +432,45 @@ if [ -z "$2" ]; then
     db_get apache2-cn/wwwhost || true
     if [ "$RET" = "true" ]; then
 
-	# Add WWW VirtualHost.
-	if [ -f "$CONFDIR/sites-available/$FQDN" ]; then
-		cp_backup_conffile -d $BACKUPDIR -p $CONFDIR/sites-available/$FQDN
-	fi
-	if [ -f "$CONFDIR/sites-available/www.$DOMAIN" ]; then
-		cp_backup_conffile -d $BACKUPDIR -p $CONFDIR/sites-available/www.$DOMAIN
-	fi
-
-	chk_conf_tag "$CONFDIR/sites-available/$FQDN"
-	if [ ! -f "$CONFDIR/sites-available/$FQDN" ] || [ $RET -eq 0 ]; then
-		if egrep -qi "^[[:space:]]*NameVirtualHost[[:space:]]+\*:80$" "$PORTCONF"; then
-			install_vhost -d -r www.$DOMAIN default $FQDN 000-$FQDN
-		else
-			install_vhost -nvh -d -r www.$DOMAIN default $FQDN 000-$FQDN
-		fi
-		need_restart=1
-	fi
-
-	chk_conf_tag "$CONFDIR/sites-available/www.$DOMAIN"
-	if [ ! -f "$CONFDIR/sites-available/www.$DOMAIN" ] || [ $RET -eq 0 ]; then
-		install_vhost default www.$DOMAIN www.$DOMAIN
-		need_restart=1
-	fi
+        # Add WWW VirtualHost.
+        if [ -f "$CONFDIR/sites-available/$FQDN" ]; then
+            cp_backup_conffile -d $BACKUPDIR -p $CONFDIR/sites-available/$FQDN
+        fi
+        if [ -f "$CONFDIR/sites-available/www.$DOMAIN" ]; then
+            cp_backup_conffile -d $BACKUPDIR -p $CONFDIR/sites-available/www.$DOMAIN
+        fi
+
+        chk_conf_tag "$CONFDIR/sites-available/$FQDN"
+        if [ ! -f "$CONFDIR/sites-available/$FQDN" ] || [ $RET -eq 0 ]; then
+            if egrep -qi "^[[:space:]]*NameVirtualHost[[:space:]]+\*:80$" "$PORTCONF"; then
+                install_vhost -d -r www.$DOMAIN default $FQDN 000-$FQDN
+            else
+                install_vhost -nvh -d -r www.$DOMAIN default $FQDN 000-$FQDN
+            fi
+            need_restart=1
+        fi
+
+        chk_conf_tag "$CONFDIR/sites-available/www.$DOMAIN"
+        if [ ! -f "$CONFDIR/sites-available/www.$DOMAIN" ] || [ $RET -eq 0 ]; then
+            install_vhost default www.$DOMAIN www.$DOMAIN
+            need_restart=1
+        fi
     else
 
-	# No WWW VirtualHost.
-	if [ -f "$CONFDIR/sites-available/$FQDN" ]; then
-		cp_backup_conffile -d $BACKUPDIR -p $CONFDIR/sites-available/$FQDN
-	fi
-
-	chk_conf_tag "$CONFDIR/sites-available/$FQDN"
-	if [ ! -f "$CONFDIR/sites-available/$FQDN" ] || [ $RET -eq 0 ]; then
-		if egrep -qi "^[[:space:]]*NameVirtualHost[[:space:]]+\*:80$" "$PORTCONF"; then
-			install_vhost -d -r $FQDN default $FQDN 000-$FQDN
-		else
-			install_vhost -nvh -d -r $FQDN default $FQDN 000-$FQDN
-		fi
-		need_restart=1
-	fi
+        # No WWW VirtualHost.
+        if [ -f "$CONFDIR/sites-available/$FQDN" ]; then
+            cp_backup_conffile -d $BACKUPDIR -p $CONFDIR/sites-available/$FQDN
+        fi
+
+        chk_conf_tag "$CONFDIR/sites-available/$FQDN"
+        if [ ! -f "$CONFDIR/sites-available/$FQDN" ] || [ $RET -eq 0 ]; then
+            if egrep -qi "^[[:space:]]*NameVirtualHost[[:space:]]+\*:80$" "$PORTCONF"; then
+                install_vhost -d -r $FQDN default $FQDN 000-$FQDN
+            else
+                install_vhost -nvh -d -r $FQDN default $FQDN 000-$FQDN
+            fi
+            need_restart=1
+        fi
     fi
 fi
 
@@ -486,22 +479,22 @@ fi
 #
 if [ $apache2_sslcert -eq 0 ]; then
 
-        if [ -f "$CONFDIR/sites-available/ssl" ]; then
-                cp_backup_conffile -d $BACKUPDIR -p $CONFDIR/sites-available/ssl
-        fi
+    if [ -f "$CONFDIR/sites-available/ssl" ]; then
+        cp_backup_conffile -d $BACKUPDIR -p $CONFDIR/sites-available/ssl
+    fi
 
-	# No active SSL VirtualHosts found - add new one.
-	chk_conf_tag "$CONFDIR/sites-available/ssl"
-	if [ ! -f "$CONFDIR/sites-available/ssl" ] || [ $RET -eq 0 ]; then
-
-		db_get apache2-cn/wwwhost || true
-		if [ "$RET" = "true" ]; then
-			install_vhost -r www.$DOMAIN -n $HOST ssl ssl 001-ssl
-		else
-			install_vhost -r $FQDN -n $HOST ssl ssl 001-ssl
-		fi
-		need_restart=1
-	fi
+    # No active SSL VirtualHosts found - add new one.
+    chk_conf_tag "$CONFDIR/sites-available/ssl"
+    if [ ! -f "$CONFDIR/sites-available/ssl" ] || [ $RET -eq 0 ]; then
+
+        db_get apache2-cn/wwwhost || true
+        if [ "$RET" = "true" ]; then
+            install_vhost -r www.$DOMAIN -n $HOST ssl ssl 001-ssl
+        else
+            install_vhost -r $FQDN -n $HOST ssl ssl 001-ssl
+        fi
+        need_restart=1
+    fi
 fi
 
 
@@ -509,38 +502,38 @@ fi
 #
 if [ $apache2_sslcert -eq 0 ]; then
 
-	chk_conf_tag "${CONFDIR}/sites-available/ssl"
-	if [ $RET -eq 0 ] && [ -n "$apache2_sslcf" ]; then
+    chk_conf_tag "${CONFDIR}/sites-available/ssl"
+    if [ $RET -eq 0 ] && [ -n "$apache2_sslcf" ]; then
 
-		SSLTMP=$(mktemp ${CONFDIR}/ssltmp.XXXXXX)
-		temp_files="${temp_files} ${SSLTMP} ${SSLTMP}.cn-old"
-		cp ${CONFDIR}/sites-available/ssl $SSLTMP
+        SSLTMP=$(mktemp ${CONFDIR}/ssltmp.XXXXXX)
+        temp_files="${temp_files} ${SSLTMP} ${SSLTMP}.cn-old"
+        cp ${CONFDIR}/sites-available/ssl $SSLTMP
 
-		# SSLCertificateFile
-		cp_check_and_sed "^[[:space:]]*SSLCertificateFile \/etc\/ssl\/certs\/apache2\.pem" \
-		    "s#SSLCertificateFile /etc/ssl/certs/apache2.pem#SSLCertificateFile $apache2_sslcf #g" \
-		    $SSLTMP || true
+        # SSLCertificateFile
+        cp_check_and_sed "^[[:space:]]*SSLCertificateFile \/etc\/ssl\/certs\/apache2\.pem" \
+            "s#SSLCertificateFile /etc/ssl/certs/apache2.pem#SSLCertificateFile $apache2_sslcf #g" \
+        $SSLTMP || true
 
-		# SSLCertificateKeyFile
-		cp_check_and_sed "^[[:space:]]*SSLCertificateKeyFile \/etc\/ssl\/private\/apache2\.key" \
-		    "s#SSLCertificateKeyFile /etc/ssl/private/apache2.key#SSLCertificateKeyFile $apache2_sslckf #g" \
-		    $SSLTMP || true
+        # SSLCertificateKeyFile
+        cp_check_and_sed "^[[:space:]]*SSLCertificateKeyFile \/etc\/ssl\/private\/apache2\.key" \
+            "s#SSLCertificateKeyFile /etc/ssl/private/apache2.key#SSLCertificateKeyFile $apache2_sslckf #g" \
+        $SSLTMP || true
 
-		# SSLCertificateChainFile
-		if [ -n "$apache2_sslccf" ]; then
-		    cp_check_and_sed "^# SSLCertificateChainFile \/etc\/ssl\/certs/sureserverEDU\.pem" \
-			"s#\# SSLCertificateChainFile /etc/ssl/certs/sureserverEDU.pem#SSLCertificateChainFile $apache2_sslccf #g" \
-			$SSLTMP || true
-		fi
+        # SSLCertificateChainFile
+        if [ -n "$apache2_sslccf" ]; then
+            cp_check_and_sed "^# SSLCertificateChainFile \/etc\/ssl\/certs/sureserverEDU\.pem" \
+                "s#\# SSLCertificateChainFile /etc/ssl/certs/sureserverEDU.pem#SSLCertificateChainFile $apache2_sslccf #g" \
+            $SSLTMP || true
+        fi
 
-		cp_mv $SSLTMP ${CONFDIR}/sites-available/ssl
+        cp_mv $SSLTMP ${CONFDIR}/sites-available/ssl
 
-		need_restart=1
+        need_restart=1
 
-		# Just to be sure.
-		[ -e "${SSLTMP}" ] && rm -f ${SSLTMP}
-		[ -e "${SSLTMP}.cn-old" ] && rm -f ${SSLTMP}.cn-old
-	fi
+        # Just to be sure.
+        [ -e "${SSLTMP}" ] && rm -f ${SSLTMP}
+        [ -e "${SSLTMP}.cn-old" ] && rm -f ${SSLTMP}.cn-old
+    fi
 fi
 
 
@@ -550,9 +543,9 @@ cp_echo "CN: Checking file access permissions for Apache2 SSL certificates."
 sslkey=/etc/ssl/private
 sslcerts="${sslkey}/ca.key ${sslkey}/apache2-ca.key ${sslkey}/apache2.key"
 for certf in $sslcerts; do
-	if [ -f "$certf" ]; then
-	    chmod 600 $certf
-	fi
+    if [ -f "$certf" ]; then
+        chmod 600 $certf
+    fi
 done
 
 
@@ -561,17 +554,17 @@ done
 #
 if egrep -iq "^[[:space:]]*Include[[:space:]]+\/etc\/apache2\/sites-enabled\/\[\^\.\#\]\*$" "$CONF"; then
 
-	cp_echo "CN: Fixing obsolete Include line in $CONF."
-	CONFTMP=`mktemp $CONF.tmp.XXXXXX`
-	sed -r "/^[[:space:]]*Include[[:space:]]+\/etc\/apache2\/sites-enabled\/\[\^\.\#\]\*$/Id" \
-		"$CONF" > "$CONFTMP"
+    cp_echo "CN: Fixing obsolete Include line in $CONF."
+    CONFTMP=`mktemp $CONF.tmp.XXXXXX`
+    sed -r "/^[[:space:]]*Include[[:space:]]+\/etc\/apache2\/sites-enabled\/\[\^\.\#\]\*$/Id" \
+        "$CONF" > "$CONFTMP"
 
-	if ! egrep -iq "^[[:space:]]*Include[[:space:]]+\/etc\/apache2\/sites-enabled\/$" "$CONFTMP"; then
-		echo "Include /etc/apache2/sites-enabled/" >> "$CONFTMP"
-	fi
+    if ! egrep -iq "^[[:space:]]*Include[[:space:]]+\/etc\/apache2\/sites-enabled\/$" "$CONFTMP"; then
+        echo "Include /etc/apache2/sites-enabled/" >> "$CONFTMP"
+    fi
 
-	cp_mv "$CONFTMP" "$CONF"
-	need_restart=1
+    cp_mv "$CONFTMP" "$CONF"
+    need_restart=1
 fi
 
 
@@ -581,8 +574,8 @@ db_stop || true
 # Remove old AOSI configuration for Apache: aosi-www.conf, aosi.conf.
 #
 if [ -e "$CONFDIR/conf.d/aosi-www.conf" ] || [ -e "$CONFDIR/conf.d/aosi.conf" ]; then
-	cp_echo "CN: Removing old AOSI configuration files for Apache2."
-	need_restart=1
+    cp_echo "CN: Removing old AOSI configuration files for Apache2."
+    need_restart=1
 fi
 [ -e "$CONFDIR/conf.d/aosi-www.conf" ] && rm -f $CONFDIR/conf.d/aosi-www.conf
 [ -e "$CONFDIR/conf.d/aosi.conf" ] && rm -f $CONFDIR/conf.d/aosi.conf
@@ -592,23 +585,17 @@ fi
 #
 if [ $need_restart -eq 1 ]; then
 
-	# Check Apache2 web server configuration.
-	if apache2ctl configtest 2>/dev/null; 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 restart || true
-		    else
-			/etc/init.d/apache2 restart || true
-		    fi
-		fi
-	else
-
-		# Something is broken.
-		cp_echo "CN: Your Apache2 configuration seem to be broken."
-		cp_echo "CN: Please, check the service after the installation finishes!"
-	fi
+    # Check Apache2 web server configuration.
+    if apache2ctl configtest 2>/dev/null; then
+
+        # Restart Apache2 web server.
+        invoke-rc.d apache2 restart || true
+    else
+
+        # Something is broken.
+        cp_echo "CN: Your Apache2 configuration seem to be broken."
+        cp_echo "CN: Please, check the service after the installation finishes!"
+    fi
 fi
 
 
@@ -620,9 +607,10 @@ cp_mail "$PKG"
 # (re)generate monit.d files if monit-cn is installed.
 #
 if [ -x "/usr/sbin/update-monit.d" ]; then
-	cp_echo "CN: Updating monit configuration..."
-	update-monit.d || true
+    cp_echo "CN: Updating monit configuration..."
+    update-monit.d || true
 fi
 
+#DEBHELPER#
 
 exit 0