diff --git a/Makefile.in b/Makefile.in
index 850b960e..3a68d238 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -66,7 +66,14 @@ $(RECURSIVE_TARGETS):
 
 installdirs: mkinstalldirs
 	$(srcdir)/mkinstalldirs \
-		$(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(libdir) $(DESTDIR)$(libexecdir)/piler $(DESTDIR)$(datarootdir)/piler $(DESTDIR)$(sysconfdir) $(DESTDIR)/etc/init.d \
+		$(DESTDIR)$(bindir) \
+		$(DESTDIR)$(sbindir) \
+		$(DESTDIR)$(libdir) \
+		$(DESTDIR)$(libexecdir)/piler \
+		$(DESTDIR)$(datarootdir)/piler \
+		$(DESTDIR)$(sysconfdir) \
+		$(DESTDIR)$(sysconfdir)/piler \
+		$(DESTDIR)/etc/init.d \
 		$(DESTDIR)$(localstatedir)/piler/store \
 		$(DESTDIR)$(localstatedir)/piler/stat $(DESTDIR)$(localstatedir)/piler/tmp \
 		$(DESTDIR)$(localstatedir)/piler/sphinx
diff --git a/etc/Makefile.in b/etc/Makefile.in
index e19395f6..2cacee32 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -26,14 +26,14 @@ INSTALL = @INSTALL@
 
 all:
 	sed -e 's%pidfile=.*%pidfile=$(localstatedir)/run/piler/piler.pid%g' \
-	-e 's%pemfile=%pemfile=$(sysconfdir)/piler.pem%g' \
+	-e 's%pemfile=%pemfile=$(sysconfdir)/piler/piler.pem%g' \
 	-e 's%workdir=.*%workdir=$(localstatedir)/piler/tmp%g' < $(srcdir)/example.conf | grep -v ^\; | grep '=' | sort > $(srcdir)/piler.conf
 
 install:
-	$(INSTALL) -m 0640 -g $(RUNNING_GROUP) $(srcdir)/piler.conf $(DESTDIR)$(sysconfdir)/piler.conf.dist
-	if [ ! -f "$(DESTDIR)$(sysconfdir)/piler.conf" ]; then $(INSTALL) -m 0640 -g $(RUNNING_GROUP) $(srcdir)/piler.conf $(DESTDIR)$(sysconfdir)/piler.conf; fi
+	$(INSTALL) -m 0640 -g $(RUNNING_GROUP) $(srcdir)/piler.conf $(DESTDIR)$(sysconfdir)/piler/piler.conf.dist
+	if [ ! -f "$(DESTDIR)$(sysconfdir)/piler/piler.conf" ]; then $(INSTALL) -m 0640 -g $(RUNNING_GROUP) $(srcdir)/piler.conf $(DESTDIR)$(sysconfdir)/piler/piler.conf; fi
 	sed -e 's%LOCALSTATEDIR%$(localstatedir)%g' $(srcdir)/sphinx.conf.in > sphinx.conf.dist
-	$(INSTALL) -m 0644 -g $(RUNNING_GROUP) $(srcdir)/sphinx.conf.dist $(DESTDIR)$(sysconfdir)/sphinx.conf.dist
+	$(INSTALL) -m 0644 -g $(RUNNING_GROUP) $(srcdir)/sphinx.conf.dist $(DESTDIR)$(sysconfdir)/piler/sphinx.conf.dist
 
 clean:
 	rm -f piler.conf cron.jobs sphinx.conf.dist
diff --git a/init.d/rc.searchd.in b/init.d/rc.searchd.in
index ca878b6c..5acb09d3 100644
--- a/init.d/rc.searchd.in
+++ b/init.d/rc.searchd.in
@@ -27,7 +27,7 @@ start() {
 	fi
 
         if [ `id -u` -eq 0 ]; then
-		su piler -c searchd
+		su piler -c "searchd --config SYSCONFDIR/piler/sphinx.conf"
 	else
 		searchd
 	fi
diff --git a/piler-config.h.in b/piler-config.h.in
index feb78ea2..4053acc6 100644
--- a/piler-config.h.in
+++ b/piler-config.h.in
@@ -6,8 +6,8 @@
 #define DATADIR "/usr/local/var"
 #define DATAROOTDIR "/usr/local/share"
 
-#define KEYFILE CONFDIR "/piler.key"
-#define LICENCE_SIGNATURE_FILE CONFDIR "/piler.lic"
+#define KEYFILE CONFDIR "/piler/piler.key"
+#define LICENCE_SIGNATURE_FILE CONFDIR "/piler/piler.lic"
 
 #define MESSAGE_ID_DEDUP_FILE DATAROOTDIR "/piler/deduphelper"
 
diff --git a/util/Makefile.in b/util/Makefile.in
index ad9814db..71db5ea3 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -26,7 +26,9 @@ INSTALL = @INSTALL@
 
 all:
 	sed -e "s%BINDIR%$(bindir)%" -e "s%__SYSCONFDIR%$(sysconfdir)%" -e "s%__LOCALSTATEDIR%$(localstatedir)%" -e "s%__LIBEXECDIR%$(libexecdir)%" -e "s%__DATAROOTDIR%$(datarootdir)%" $(srcdir)/postinstall.sh.in > $(srcdir)/postinstall.sh
-
+	sed -i -e "s%SYSCONFDIR%$(sysconfdir)%" $(srcdir)/indexer.delta.sh
+	sed -i -e "s%SYSCONFDIR%$(sysconfdir)%" $(srcdir)/indexer.main.sh
+	sed -i -e "s%SYSCONFDIR%$(sysconfdir)%" $(srcdir)/indexer.attachment.sh
 
 install:
 	$(INSTALL) -m 0755 $(srcdir)/automated-search.php $(DESTDIR)$(libexecdir)/piler
diff --git a/util/docker-first-time-fix.sh b/util/docker-first-time-fix.sh
deleted file mode 100755
index 5a9474fb..00000000
--- a/util/docker-first-time-fix.sh
+++ /dev/null
@@ -1,444 +0,0 @@
-#!/bin/bash
-
-HOSTNAME=`hostname -f`
-PILER_HOST_IP="127.0.0.1"
-SMARTHOST=""
-PILERUSER="piler"
-MYSQL_HOSTNAME="localhost"
-MYSQL_DATABASE="piler"
-MYSQL_USERNAME="piler"
-MYSQL_PASSWORD="verystrongpassword"
-MYSQL_ROOT_PASSWORD="piler123"
-KEYFILE="/usr/local/etc/piler.key"
-KEYTMPFILE="key.tmp"
-DOCROOT="/var/www/piler"
-WWWGROUP="www-data"
-SSL_CERT_DATA="/C=US/ST=Denial/L=Springfield/O=Dis/CN=www.example.com"
-SPHINX_PILER_CONFIG="/usr/local/etc/sphinx.conf"
-CRON_TMP=aaaa.11
-
-
-isFQDN() {
-  # we need min. 2 dots
-  if [ x"$1" = "xdogfood" ]; then
-    echo 1
-    return
-  fi
-
-  if [ x"$1" = "x" ]; then
-    echo 0
-    return
-  fi
-
-  NF=`echo $1 | awk -F. '{print NF}'`
-  if [ $NF -ge 2 ]; then
-    echo 1
-  else
-    echo 0
-  fi
-}
-
-
-ask() {
-  PROMPT=$1
-  DEFAULT=$2
-
-  echo ""
-  echo -n "$PROMPT [$DEFAULT] "
-  read response
-
-  if [ -z $response ]; then
-    response=$DEFAULT
-  fi
-}
-
-
-askNonBlankNoEcho() {
-  PROMPT=$1
-  DEFAULT=$2
-
-  while [ 1 ]; do
-    stty -echo
-    ask "$PROMPT" "$DEFAULT"
-    stty echo
-    echo ""
-    if [ ! -z $response ]; then
-      break
-    fi
-    echo "A non-blank answer is required"
-  done
-}
-
-
-askNoEcho() {
-  PROMPT=$1
-  DEFAULT=$2
-
-  stty -echo
-  ask "$PROMPT" "$DEFAULT"
-  stty echo
-  echo ""
-}
-
-
-askNonBlank() {
-  PROMPT=$1
-  DEFAULT=$2
-
-  while [ 1 ]; do
-    ask "$PROMPT" "$DEFAULT"
-    if [ ! -z $response ]; then
-      break
-    fi
-    echo "A non-blank answer is required"
-  done
-}
-
-
-
-askYN() {
-  PROMPT=$1
-  DEFAULT=$2
-
-  if [ "x$DEFAULT" = "xyes" -o "x$DEFAULT" = "xYes" -o "x$DEFAULT" = "xy" -o "x$DEFAULT" = "xY" ]; then
-    DEFAULT="Y"
-  else
-    DEFAULT="N"
-  fi
-
-  while [ 1 ]; do
-    ask "$PROMPT" "$DEFAULT"
-    response=$(perl -e "print lc(\"$response\");")
-    if [ -z $response ]; then
-      :
-    else
-      if [ $response = "yes" -o $response = "y" ]; then
-        response="yes"
-        break
-      else
-        if [ $response = "no" -o $response = "n" ]; then
-          response="no"
-          break
-        fi
-      fi
-    fi
-    echo "A Yes/No answer is required"
-  done
-}
-
-
-check_user() {
-   user=$1
-
-   if [ x`whoami` != x$user ]; then echo "ERROR: the installer must be run as $user user"; exit 1; fi
-}
-
-
-get_mysql_root_pwd() {
-
-   askNoEcho "Please enter mysql root password" ""
-   MYSQL_ROOT_PASSWORD=$response
-
-   s=`echo "use information_schema; select TABLE_NAME from TABLES where TABLE_SCHEMA='$MYSQL_DATABASE'" | mysql -h $MYSQL_HOSTNAME -u root --password=$MYSQL_ROOT_PASSWORD`
-   if [ $? -eq 0 ];
-   then
-      echo "mysql connection successful"; echo;
-      if [ `echo $s | grep -c metadata` -eq 1 ]; then echo "ERROR: Detected metadata table in $MYSQL_DATABASE. Aborting"; exit 0; fi
-   else
-      echo "ERROR: failed to connect to mysql";
-      get_mysql_root_pwd
-   fi
-
-}
-
-
-collect_data() {
-   askNonBlank "Please enter FQDN of this host" "$HOSTNAME"
-   HOSTNAME=$response
-
-   ask "Please enter the FQDN / IP-address of the smarthost" "$SMARTHOST"
-   SMARTHOST=$response
-
-   askNonBlank "Please enter the group of the webserver" "$WWWGROUP"
-   WWWGROUP=$response
-
-   askNonBlank "Please enter SSL certificate data for the piler deamon" "$SSL_CERT_DATA"
-   SSL_CERT_DATA=$response
-
-   askNonBlankNoEcho "Please enter mysql password for $MYSQL_USERNAME" ""
-   MYSQL_PASSWORD=$response
-
-   get_mysql_root_pwd
-
-   show_install_parameters
-
-   askYN "Accept and continue? [Y/n]: " "Y"
-   YN=$response
-
-   if test "$YN" = "no"; then collect_data; fi
-
-   hostname $HOSTNAME
-
-}
-
-
-show_install_parameters() {
-   echo
-   echo "Configuration details:"
-   echo "----------------------"
-   echo
-   echo "Hostname: $HOSTNAME"
-   echo "IP-address: $PILER_HOST_IP"
-   echo "Smarthost: $SMARTHOST"
-   echo "Documentroot: $DOCROOT"
-   echo "Webserver user: $WWWGROUP"
-   echo "Piler SSL cert data: $SSL_CERT_DATA"
-}
-
-
-show_licence() {
-   echo
-   echo "This is the piler first time postinstall for docker script."
-   echo "DO NOT run the postinstall if you have done it before!"
-   echo
-   echo "Enter Y to accept the licence and continue."
-   echo
-
-   askYN "Accept licence? [y/N]: " "N"
-   YN=$response
-
-   if test "$YN" != "yes"; then echo "Aborted."; exit 1; fi
-}
-
-
-configure_piler() {
-
-
-cat <<PILERCONF > /usr/local/etc/piler.conf
-archive_emails_not_having_message_id=0
-archive_only_mydomains=0
-backlog=20
-cipher_list=HIGH:MEDIUM
-clamd_socket=/tmp/clamd
-debug=0
-default_retention_days=2557
-enable_cjk=0
-encrypt_messages=1
-extra_to_field=X-Envelope-To:
-hostid=$HOSTNAME
-iv=
-listen_addr=0.0.0.0
-listen_port=25
-locale=
-max_requests_per_child=1000
-memcached_servers=127.0.0.1
-memcached_to_db_interval=900
-memcached_ttl=86400
-min_word_len=1
-mysqlhost=
-mysqlport=0
-mysqlsocket=/var/run/mysqld/mysqld.sock
-mysqluser=$MYSQL_USERNAME
-mysqlpwd=$MYSQL_PASSWORD
-mysqldb=$MYSQL_DATABASE
-mysql_connect_timeout=2
-number_of_worker_processes=10
-pemfile=/usr/local/etc/piler.pem
-pidfile=/var/run/piler/piler.pid
-piler_header_field=X-piler: piler already archived this email
-queuedir=/var/piler/store
-server_id=0
-session_timeout=420
-syslog_recipients=1
-spam_header_line=
-tls_enable=1
-username=piler
-verbosity=1
-workdir=/var/piler/tmp
-PILERCONF
-
-}
-
-
-writing_piler_crontab() {
-
-cat <<CRONTAB > $CRON_TMP
-
-### PILERSTART
-5,35 * * * * /usr/local/libexec/piler/indexer.delta.sh
-30   2 * * * /usr/local/libexec/piler/indexer.main.sh
-*/15 * * * * /usr/local/bin/indexer --quiet tag1 --rotate
-*/15 * * * * /usr/local/bin/indexer --quiet note1 --rotate
-30   6 * * * /usr/bin/php /usr/local/libexec/piler/generate_stats.php --webui /var/www/piler > /dev/null
-*/5 * * * * /usr/bin/find /var/www/piler/tmp -type f -name i.\* -exec rm -f {} \;
-
-### PILEREND
-CRONTAB
-
-crontab -u $PILERUSER $CRON_TMP
-
-rm -f $CRON_TMP
-
-}
-
-
-piler_postinstall() {
-
-cd /tmp
-
-mkdir -p /var/piler/tmp /var/piler/stat /var/piler/imap /var/piler/store/00 /var/piler/import /var/piler/export /var/piler/sphinx
-chown -R piler:piler /var/piler/tmp /var/piler/stat /var/piler/imap /var/piler/store /var/piler/import /var/piler/export /var/piler/sphinx
-
-echo -n "Creating mysql database... ";
-sed -e "s%MYSQL_HOSTNAME%$MYSQL_HOSTNAMEg%" -e "s%MYSQL_DATABASE%$MYSQL_DATABASE%g" -e "s%MYSQL_USERNAME%$MYSQL_USERNAME%g" -e "s%MYSQL_PASSWORD%$MYSQL_PASSWORD%g" /usr/local/share/piler/db-mysql-root.sql.in | mysql -h $MYSQL_HOSTNAME -u root --password=$MYSQL_ROOT_PASSWORD
-mysql -h $MYSQL_HOSTNAME -u $MYSQL_USERNAME --password=$MYSQL_PASSWORD $MYSQL_DATABASE < /usr/local/share/piler/db-mysql.sql
-echo "Done."
-
-echo -n "Overwriting sphinx configuration... ";
-sed -e "s%MYSQL_HOSTNAME%$MYSQL_HOSTNAME%" -e "s%MYSQL_DATABASE%$MYSQL_DATABASE%" -e "s%MYSQL_USERNAME%$MYSQL_USERNAME%" -e "s%MYSQL_PASSWORD%$MYSQL_PASSWORD%" jsuto-piler-*/etc/sphinx.conf.in > /usr/local/etc/sphinx.conf
-echo "Done."
-
-echo -n "Initializing sphinx indices... ";
-su $PILERUSER -c "indexer --all"
-echo "Done."
-
-echo -n "Generating openssh keys ... ";
-/usr/bin/ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
-/usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
-/usr/bin/ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N ''
-echo "Done."
-
-echo -n "Making an ssl certificate ... "
-openssl req -new -newkey rsa:4096 -days 3650 -nodes -x509 -subj "$SSL_CERT_DATA" -keyout /usr/local/etc/piler.pem -out 1.cert
-cat 1.cert >> /usr/local/etc/piler.pem
-chmod 600 /usr/local/etc/piler.pem
-rm 1.cert
-
-
-echo -n "installing keyfile ($KEYTMPFILE) to $KEYFILE... "
-dd if=/dev/urandom bs=56 count=1 of=$KEYTMPFILE
-cp $KEYTMPFILE $KEYFILE
-chgrp $PILERUSER $KEYFILE
-chmod 640 $KEYFILE
-rm -f $KEYTMPFILE
-echo "Done."
-
-cat <<NGINXCONFIG > /usr/local/etc/nginx-piler.conf
-
-server {
-        server_name  $HOSTNAME;
-
-        root /var/www/piler;
-
-        access_log  /var/log/nginx/$HOSTNAME-access.log;
-        error_log   /var/log/nginx/$HOSTNAME-error.log;
-
-        gzip  on;
-        gzip_types text/plain application/xml text/css;
-        gzip_vary on;
-
-        location / {
-            index  index.php index.html;
-        }
-
-        #error_page  404              /404.html;
-
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   html;
-        }
-
-        location ~ [^/]\.php(/|$) {
-            fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-            if (!-f \$document_root\$fastcgi_script_name) {
-               return 404;
-            }
-
-            fastcgi_pass unix:/var/run/php5-fpm.sock;
-            fastcgi_index index.php;
-            include fastcgi_params;
-        }
-
-        location ~* \.(ico|css|js|gif|jpe?g|png)$ {
-            expires 2w;
-        }
-
-        rewrite /search.php /index.php?route=search/search&type=simple;
-        rewrite /advanced.php /index.php?route=search/search&type=advanced;
-        rewrite /expert.php /index.php?route=search/search&type=expert;
-        rewrite /search-helper.php /index.php?route=search/helper;
-        rewrite /audit-helper.php /index.php?route=audit/helper;
-        rewrite /message.php /index.php?route=message/view;
-        rewrite /bulkrestore.php /index.php?route=message/bulkrestore;
-        rewrite /bulkpdf.php /index.php?route=message/bulkpdf;
-        rewrite /folders.php /index.php?route=folder/list&;
-        rewrite /settings.php /index.php?route=user/settings;
-        rewrite /login.php /index.php?route=login/login;
-        rewrite /logout.php /index.php?route=login/logout;
-        rewrite /google.php /index.php?route=login/google;
-        rewrite /domain.php /index.php?route=domain/domain;
-        rewrite /ldap.php /index.php?route=ldap/list;
-        rewrite /customer.php /index.php?route=customer/list;
-        rewrite /retention.php /index.php?route=policy/retention;
-        rewrite /archiving.php /index.php?route=policy/archiving;
-        rewrite /view/javascript/piler.js /js.php;
-}
-NGINXCONFIG
-
-
-cat <<CONFIGSITE > /usr/local/etc/config-site.php
-<?php
-
-\$config['SITE_NAME'] = '$HOSTNAME';
-\$config['SITE_URL'] = 'http://' . \$config['SITE_NAME'] . '/';
-\$config['DIR_BASE'] = '$DOCROOT/';
-
-\$config['TIMEZONE'] = 'Europe/Budapest';
-
-\$config['ENABLE_SYSLOG'] = 1;
-
-\$config['SMTP_DOMAIN'] = '$HOSTNAME';
-\$config['SMTP_FROMADDR'] = 'no-reply@$HOSTNAME';
-\$config['ADMIN_EMAIL'] = 'admin@$HOSTNAME';
-
-\$config['DB_DRIVER'] = 'mysql';
-\$config['DB_PREFIX'] = '';
-\$config['DB_HOSTNAME'] = '$MYSQL_HOSTNAME';
-\$config['DB_USERNAME'] = '$MYSQL_USERNAME';
-\$config['DB_PASSWORD'] = '$MYSQL_PASSWORD';
-\$config['DB_DATABASE'] = '$MYSQL_DATABASE';
-
-\$config['PILER_HOST'] = '$PILER_HOST_IP';
-
-\$config['SMARTHOST'] = '$SMARTHOST';
-\$config['SMARTHOST_PORT'] = 25;
-
-?>
-CONFIGSITE
-
-}
-
-
-
-
-check_user root
-show_licence
-
-
-collect_data
-
-
-###write_nginx_vhost
-
-
-
-configure_piler
-
-piler_postinstall
-
-writing_piler_crontab
-
-echo "changing root password:"
-passwd root
-
-
diff --git a/util/indexer.attachment.sh b/util/indexer.attachment.sh
index fcbc5803..219264ea 100755
--- a/util/indexer.attachment.sh
+++ b/util/indexer.attachment.sh
@@ -2,7 +2,7 @@
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 DELTATMPFILE=/var/run/piler/delta.attachment.indexer.tmp
-INDEXER=indexer
+INDEXER="indexer --config SYSCONFDIR/piler/sphinx.conf"
 PRIORITY=mail.error
 TOUCHFILE=/var/piler/stat/indexer.attachment
 
diff --git a/util/indexer.delta.sh b/util/indexer.delta.sh
index c503dde0..6da9e8bf 100755
--- a/util/indexer.delta.sh
+++ b/util/indexer.delta.sh
@@ -3,7 +3,7 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 MAINTMPFILE=/var/run/piler/main.indexer.tmp
 DELTATMPFILE=/var/run/piler/delta.indexer.tmp
-INDEXER=indexer
+INDEXER="indexer --config SYSCONFDIR/piler/sphinx.conf"
 PRIORITY=mail.error
 TOUCHFILE=/var/piler/stat/indexer
 
diff --git a/util/indexer.main.sh b/util/indexer.main.sh
index d282171c..8bf1549a 100755
--- a/util/indexer.main.sh
+++ b/util/indexer.main.sh
@@ -2,7 +2,7 @@
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 MAINTMPFILE=/var/run/piler/main.indexer.tmp
-INDEXER=indexer
+INDEXER="indexer --config SYSCONFDIR/piler/sphinx.conf"
 PRIORITY=mail.error
 TOUCHFILE=/var/piler/stat/indexer
 
diff --git a/util/postinstall.sh.in b/util/postinstall.sh.in
index 894f86fe..0ac59e04 100755
--- a/util/postinstall.sh.in
+++ b/util/postinstall.sh.in
@@ -18,7 +18,7 @@ load_default_values() {
    DATAROOTDIR=__DATAROOTDIR
 
    KEYTMPFILE="piler.key"
-   KEYFILE="$SYSCONFDIR/piler.key"
+   KEYFILE="$SYSCONFDIR/piler/piler.key"
 
    HOSTNAME=`hostname --fqdn`
 
@@ -29,7 +29,7 @@ load_default_values() {
    MYSQL_ROOT_PASSWORD=""
    MYSQL_SOCKET=""
 
-   SPHINXCFG="/usr/local/etc/sphinx.conf"
+   SPHINXCFG="/usr/local/etc/piler/sphinx.conf"
 
    WWWGROUP="apache"
    DOCROOT="/var/www/piler"
@@ -42,11 +42,11 @@ load_default_values() {
 
 
 make_certificate() {
-   if [ ! -f $SYSCONFDIR/piler.pem ]; then
+   if [ ! -f $SYSCONFDIR/piler/piler.pem ]; then
       echo -n "Making an ssl certificate ... "
-      openssl req -new -newkey rsa:4096 -days 3650 -nodes -x509 -subj "$SSL_CERT_DATA" -keyout $SYSCONFDIR/piler.pem -out 1.cert -sha1
-      cat 1.cert >> $SYSCONFDIR/piler.pem
-      chmod 600 $SYSCONFDIR/piler.pem
+      openssl req -new -newkey rsa:4096 -days 3650 -nodes -x509 -subj "$SSL_CERT_DATA" -keyout $SYSCONFDIR/piler/piler.pem -out 1.cert -sha1
+      cat 1.cert >> $SYSCONFDIR/piler/piler.pem
+      chmod 600 $SYSCONFDIR/piler/piler.pem
       rm 1.cert
    fi
 }
@@ -241,11 +241,6 @@ gather_mysql_account() {
 
 
 gather_sphinx_data() {
-
-   if [ $INDEXER = "/usr/bin/indexer" ]; then SPHINXCFG="/etc/sphinx/sphinx.conf"; fi
-
-   if test -f /etc/sphinxsearch/sphinx.conf || test -f /etc/sphinxsearch/sphinx.conf.sample ; then SPHINXCFG="/etc/sphinxsearch/sphinx.conf"; fi
-
    askNonBlank "Please enter the path of sphinx.conf" "$SPHINXCFG"
    SPHINXCFG=$response
 }
@@ -282,8 +277,8 @@ make_cron_entries() {
    echo "5,35 * * * * $LIBEXECDIR/piler/indexer.delta.sh" >> $CRON_TMP
    echo "30   2 * * * $LIBEXECDIR/piler/indexer.main.sh" >> $CRON_TMP
    echo "15,45 * * * * $LIBEXECDIR/piler/indexer.attachment.sh" >> $CRON_TMP
-   echo "*/15 * * * * $INDEXER --quiet tag1 --rotate" >> $CRON_TMP
-   echo "*/15 * * * * $INDEXER --quiet note1 --rotate" >> $CRON_TMP
+   echo "*/15 * * * * $INDEXER --quiet tag1 --rotate --config $SYSCONFDIR/piler/sphinx.conf" >> $CRON_TMP
+   echo "*/15 * * * * $INDEXER --quiet note1 --rotate --config $SYSCONFDIR/piler/sphinx.conf" >> $CRON_TMP
    echo "30   6 * * * /usr/bin/php $LIBEXECDIR/piler/generate_stats.php --webui $DOCROOT" >> $CRON_TMP
    echo "*/5 * * * * /usr/bin/find $DOCROOT/tmp -type f -name i.\* -exec rm -f {} \;" >> $CRON_TMP
    echo "### PILEREND" >> $CRON_TMP
@@ -354,7 +349,7 @@ execute_post_install_tasks() {
    echo "Done."
 
    echo -n "Writing sphinx configuration... ";
-   sed -e "s%MYSQL_HOSTNAME%$MYSQL_HOSTNAME%" -e "s%MYSQL_DATABASE%$MYSQL_DATABASE%" -e "s%MYSQL_USERNAME%$MYSQL_USERNAME%" -e "s%MYSQL_PASSWORD%$MYSQL_PASSWORD%" $SYSCONFDIR/sphinx.conf.dist > $SPHINXCFG
+   sed -e "s%MYSQL_HOSTNAME%$MYSQL_HOSTNAME%" -e "s%MYSQL_DATABASE%$MYSQL_DATABASE%" -e "s%MYSQL_USERNAME%$MYSQL_USERNAME%" -e "s%MYSQL_PASSWORD%$MYSQL_PASSWORD%" $SYSCONFDIR/piler/sphinx.conf.dist > $SPHINXCFG
    echo "Done."
 
    echo -n "Initializing sphinx indices... ";
@@ -384,8 +379,8 @@ SOCKHELPER
 
    MYSQL_SOCKET=`perl $SOCKET_HELPER_SCRIPT $MYSQL_SOCKET`
 
-   sed -e "s/mysqlpwd=verystrongpassword/mysqlpwd=$MYSQL_PASSWORD/" -e "s/tls_enable=0/tls_enable=1/" -e "s/mysqlsocket=\/var\/run\/mysqld\/mysqld.sock/mysqlsocket=$MYSQL_SOCKET/" $SYSCONFDIR/piler.conf > $PILERCONF_TMP
-   cat $PILERCONF_TMP > $SYSCONFDIR/piler.conf
+   sed -e "s/mysqlpwd=verystrongpassword/mysqlpwd=$MYSQL_PASSWORD/" -e "s/tls_enable=0/tls_enable=1/" -e "s/mysqlsocket=\/var\/run\/mysqld\/mysqld.sock/mysqlsocket=$MYSQL_SOCKET/" $SYSCONFDIR/piler/piler.conf > $PILERCONF_TMP
+   cat $PILERCONF_TMP > $SYSCONFDIR/piler/piler.conf
    rm -f $PILERCONF_TMP
 
    chmod 755 $LOCALSTATEDIR/piler/stat