From 1f87890f4f1b4893b9957085e9b9ecf998cd2699 Mon Sep 17 00:00:00 2001
From: simatec <nais@gmx.net>
Date: Tue, 8 Mar 2022 13:42:38 +0100
Subject: [PATCH] (simatec) Beta 0.1.0

---
 README.md        | 14 +++++++-----
 install-piler.sh | 55 +++++++++++++++++++++++++++++++++++-------------
 2 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index bb27c06..349ca21 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,8 @@ https://www.mailpiler.org/
 
 * Install Docker
 
+`apt install curl git -y`
+
 `curl -sSL https://get.docker.com/ | CHANNEL=stable sh`
 
 `systemctl enable --now docker`
@@ -31,13 +33,15 @@ https://www.mailpiler.org/
 
 * remove postfix
 
-`apt purge postfix`
+`apt purge postfix -y`
 
 * Clone repository
 
-`cd /opt
-clone https://github.com/simatec/piler-docker.git
-cd /opt/piler-docker`
+`cd /opt`
+
+`git clone https://github.com/simatec/piler-docker.git`
+
+`cd /opt/piler-docker`
 
 configure your Piler seetings
 
@@ -45,7 +49,7 @@ configure your Piler seetings
 
 after config start the Install
 
-`./install-piler.sh`
+`bash install-piler.sh`
 
 Congratulations your Piler is installed...
 
diff --git a/install-piler.sh b/install-piler.sh
index b101a6e..ab86ed2 100644
--- a/install-piler.sh
+++ b/install-piler.sh
@@ -3,22 +3,34 @@
 . ./piler.conf
 ln -s ./piler.conf .env
 
-# docker stop
+# docker start
+echo
+echo "==================================="
 echo "start docker-compose for Piler"
+echo "==================================="
+echo
 
-cd /opt/piler
+cd /opt/piler-docker
 docker-compose up -d
 
+echo
+echo "==================================="
 echo "backup the File config-site.php"
-cp /var/lib/docker/volumes/piler_piler_etc/_data/config-site.php /var/lib/docker/volumes/piler_piler_etc/_data/config-site.php.bak
+echo "==================================="
+echo
 
+cp /var/lib/docker/volumes/piler-docker_piler_etc/_data/config-site.php /var/lib/docker/volumes/piler-docker_piler_etc/_data/config-site.php.bak
+
+echo
+echo "==================================="
 echo "set User settings ..."
-
-cat >> /var/lib/docker/volumes/piler_piler_etc/_data/config-site.php <<EOF
+echo "==================================="
+echo
+cat >> /var/lib/docker/volumes/piler-docker_piler_etc/_data/config-site.php <<EOF
 
 // Smarthost
-$config['SMARTHOST'] = '$SMARTHOST';
-$config['SMARTHOST_PORT'] = '25';
+\$config['SMARTHOST'] = '$SMARTHOST';
+\$config['SMARTHOST_PORT'] = '25';
 
 // CUSTOM
 \$config['PROVIDED_BY'] = '$PILER_DOMAIN';
@@ -73,26 +85,39 @@ EOF
 
 if [ "$USE_MAILCOW" = true ] ; then
 
+echo
+echo "==================================="
 echo "set Mailcow Api-Key config"
+echo "==================================="
+echo
 
-cat >> /var/lib/docker/volumes/piler_piler_etc/_data/config-site.php <<EOF
+cat >> /var/lib/docker/volumes/piler-docker_piler_etc/_data/config-site.php <<EOF
 
 // Mailcow API
-$config['MAILCOW_API_KEY'] = '$MAILCOW_APIKEY';
-$config['MAILCOW_SET_REALNAME'] = true;
-$config['CUSTOM_EMAIL_QUERY_FUNCTION'] = 'query_mailcow_for_email_access';
-$config['MAILCOW_HOST'] = '$MAILCOW_HOST'; // default $config['IMAP_HOST']
+\$config['MAILCOW_API_KEY'] = '$MAILCOW_APIKEY';
+\$config['MAILCOW_SET_REALNAME'] = true;
+\$config['CUSTOM_EMAIL_QUERY_FUNCTION'] = 'query_mailcow_for_email_access';
+\$config['MAILCOW_HOST'] = '$MAILCOW_HOST'; // default $config['IMAP_HOST']
 include('auth-mailcow.php');
 EOF
 
-curl -o /var/lib/docker/volumes/piler_piler_etc/_data/auth-mailcow.php https://raw.githubusercontent.com/patschi/mailpiler-mailcow-integration/master/auth-mailcow.php
+curl -o /var/lib/docker/volumes/piler-docker_piler_etc/_data/auth-mailcow.php https://raw.githubusercontent.com/patschi/mailpiler-mailcow-integration/master/auth-mailcow.php
 fi
 
 # docker start
+echo
+echo "==================================="
 echo "restart docker-compose ..."
+echo "==================================="
+echo
 
-cd /opt/piler
+cd /opt/piler-docker
 docker-compose restart
 
+echo
+echo "======================================================================="
 echo "Piler install completed successfully"
-echo "you can start in your Browser with http://${PILER_DOMAIN}!"
\ No newline at end of file
+echo
+echo "you can start in your Browser with http://${PILER_DOMAIN}:8080!"
+echo "======================================================================="
+echo