X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=debian%2Fconfig;h=831ea0e206940fcbe5a4bae109a099262fa129e4;hb=efcba04e69e03fa428d417afac63b38073852eaf;hp=d2ae8b40925b7b48ecaba65d6e44a3feec57b014;hpb=3a175f24bcb26ca98d85a8c4ddd12bc8834494c5;p=apache2-cn.git

diff --git a/debian/config b/debian/config
index d2ae8b4..831ea0e 100755
--- a/debian/config
+++ b/debian/config
@@ -27,12 +27,11 @@ DOMAIN=$(hostname -d)
 # Check for existing SSL VirtualHosts.
 #
 has_listen_ssl=0
-
-if [ -d "$CONFDIR/conf.d" ] && [ -n "$(ls $CONFDIR/conf.d)" ]; then
-    listen_ssl_mask=$CONFDIR/conf.d/*
+if [ -d "$CONFDIR/conf-enabled" ] && [ -n "$(ls -A $CONFDIR/conf-enabled/)" ]; then
+    listen_ssl_mask=$CONFDIR/conf-enabled/*.conf
 fi
-if [ -d "$CONFDIR/sites-enabled" ] && [ -n "$(ls $CONFDIR/sites-enabled)" ]; then
-    listen_ssl_mask=$listen_ssl_mask" "$CONFDIR/sites-enabled/*
+if [ -d "$CONFDIR/sites-enabled" ] && [ -n "$(ls -A $CONFDIR/sites-enabled/)" ]; then
+    listen_ssl_mask=$listen_ssl_mask" "$CONFDIR/sites-enabled/*.conf
 fi
 
 for file in $CONF $listen_ssl_mask; do