From 72de8b29cf41c62a473d99788e18771c3a9aa446 Mon Sep 17 00:00:00 2001
From: Cloud User <centos@mail-beta.pley.net>
Date: Wed, 30 Nov 2016 22:24:38 +0000
Subject: [PATCH] Fix Makefile and dovecot configuration errors.

---
 Makefile          | 19 +++++++++++++++----
 config.local.php  |  2 +-
 postfixadmin.conf |  6 +++++-
 setup-postfix.sh  |  1 +
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 6e02f28..3e55dfa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,24 @@
-SRC := $(shell pwd)
 DST := /etc/postfix
 
-INPUTS := configuration/* configuration/mysql/*
+INPUTS := \
+	configuration/main.cf \
+	configuration/master.cf \
+	configuration/postgrey_whitelist_clients.local \
+	configuration/postgrey_whitelist_recipients \
+	configuration/rbl_override \
+	configuration/mysql/relay_domains.cf \
+	configuration/mysql/virtual_alias_maps.cf \
+	configuration/mysql/virtual_domains_maps.cf \
+	configuration/mysql/virtual_mailbox_limits.cf \
+	configuration/mysql/virtual_mailbox_maps.cf
 
-all: $(INPUTS:configuration/%=$(DST)/%) postfixadmin
+OUTPUTS := $(subst configuration/,$(DST)/,$(INPUTS))
+
+all: $(OUTPUTS) postfixadmin
 
 postfixadmin:
 	./setup-postfix.sh
 
-$(DST)/%: $(SRC)/%
+$(DST)/%: configuration/%
 	@mkdir -p $(@D)
 	cp $^ $@
diff --git a/config.local.php b/config.local.php
index 6a47fcd..c6ef3e3 100644
--- a/config.local.php
+++ b/config.local.php
@@ -20,7 +20,7 @@ $CONF['transport'] = 'YES';
 $CONF['transport_options'] = array (
     'virtual',  // for virtual accounts
     'local',    // for system accounts
-    'relay'     // for backup mx
+    'relay',    // for backup mx
     'mailman'   // for mailing lists
 );
 
diff --git a/postfixadmin.conf b/postfixadmin.conf
index 68b439a..3a3847d 100644
--- a/postfixadmin.conf
+++ b/postfixadmin.conf
@@ -1,5 +1,9 @@
 Alias /postfixadmin /usr/local/share/postfixadmin
 
 <Directory /usr/local/share/postfixadmin>
-AllowOverride all
+        Options +Indexes +FollowSymLinks +ExecCGI
+        AllowOverride AuthConfig FileInfo
+                Order allow,deny
+        Allow from all
+        Require all granted
 </Directory>
diff --git a/setup-postfix.sh b/setup-postfix.sh
index b19e9e2..7fcb269 100755
--- a/setup-postfix.sh
+++ b/setup-postfix.sh
@@ -30,3 +30,4 @@ if [[ postfixadmin.conf -nt /etc/httpd/conf.d/postfixadmin.conf ]]; then
     echo Configuring postfixadmin in Apache.
     sudo cp postfixadmin.conf /etc/httpd/conf.d/postfixadmin.conf
 fi
+sudo yum install php-imap
-- 
2.40.1