Fix Makefile and dovecot configuration errors.

diff --git a/Makefile b/Makefile
index 6e02f284589e80a3df906393c2ce3273e9d965eb..3e55dfab5a170c47ac0be9dccf3a5f716b0821a1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,24 @@
-SRC := $(shell pwd)

 DST := /etc/postfix
 
 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
 
 
 postfixadmin:
        ./setup-postfix.sh
 

-$(DST)/%: $(SRC)/%
+$(DST)/%: configuration/%

        @mkdir -p $(@D)
        cp $^ $@
        @mkdir -p $(@D)
        cp $^ $@

diff --git a/config.local.php b/config.local.php
index 6a47fcdeaae4864d580602447291cb2f380714f2..c6ef3e336eef2ddd2ee7e8d6f8c888b6fd975767 100644 (file)
--- 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
 $CONF['transport_options'] = array (
     'virtual',  // for virtual accounts
     'local',    // for system accounts

-    'relay'     // for backup mx
+    'relay',    // for backup mx

     'mailman'   // for mailing lists
 );
 
     'mailman'   // for mailing lists
 );
 

diff --git a/postfixadmin.conf b/postfixadmin.conf
index 68b439af20d136eeeb15034f1fd7aebd175611f3..3a3847ddd07d7b6bfc004fd7b65269fe6c61cb79 100644 (file)
--- a/postfixadmin.conf
+++ b/postfixadmin.conf
@@ -1,5 +1,9 @@
 Alias /postfixadmin /usr/local/share/postfixadmin
 
 <Directory /usr/local/share/postfixadmin>
 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>
 </Directory>

diff --git a/setup-postfix.sh b/setup-postfix.sh
index b19e9e21575668ebaa693abd9a3188d3951e21f4..7fcb269f3a6979780e789dca186c601fe396a388 100755 (executable)
--- 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
     echo Configuring postfixadmin in Apache.
     sudo cp postfixadmin.conf /etc/httpd/conf.d/postfixadmin.conf
 fi

+sudo yum install php-imap