Reorganize files around subprojects.

diff --git a/Makefile b/Makefile
index 3e55dfab5a170c47ac0be9dccf3a5f716b0821a1..6183414beeeb5231550a3fc5c2c12b7ae052aec2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,7 @@
-DST := /etc/postfix
+SUBDIRS := postfix postfixadmin 
 
-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: $(SUBDIRS)
+.PHONY: $(SUBDIRS)
 
-OUTPUTS := $(subst configuration/,$(DST)/,$(INPUTS))
-
-all: $(OUTPUTS) postfixadmin
-
-postfixadmin:
-       ./setup-postfix.sh
-
-$(DST)/%: configuration/%
-       @mkdir -p $(@D)
-       cp $^ $@
+$(SUBDIRS):
+       $(MAKE) -C $@

diff --git a/postfix/Makefile b/postfix/Makefile
new file mode 100644 (file)
index 0000000..fb35215
--- /dev/null
+++ b/postfix/Makefile
@@ -0,0 +1,21 @@
+DST := /etc/postfix
+
+INPUTS := \
+       main.cf \
+       master.cf \
+       postgrey_whitelist_clients.local \
+       postgrey_whitelist_recipients \
+       rbl_override \
+       mysql/relay_domains.cf \
+       mysql/virtual_alias_maps.cf \
+       mysql/virtual_domains_maps.cf \
+       mysql/virtual_mailbox_limits.cf \
+       mysql/virtual_mailbox_maps.cf
+
+OUTPUTS := $(INPUTS:%=$(DST)/%)
+
+all: $(OUTPUTS)
+
+$(DST)/%: configuration/%
+       @mkdir -p $(@D)
+       cp $^ $@

diff --git a/configuration/main.cf b/postfix/main.cf
similarity index 100%
rename from configuration/main.cf
rename to postfix/main.cf

diff --git a/configuration/master.cf b/postfix/master.cf
similarity index 100%
rename from configuration/master.cf
rename to postfix/master.cf

diff --git a/configuration/mysql/relay_domains.cf b/postfix/mysql/relay_domains.cf
similarity index 100%
rename from configuration/mysql/relay_domains.cf
rename to postfix/mysql/relay_domains.cf

diff --git a/configuration/mysql/virtual_alias_maps.cf b/postfix/mysql/virtual_alias_maps.cf
similarity index 100%
rename from configuration/mysql/virtual_alias_maps.cf
rename to postfix/mysql/virtual_alias_maps.cf

diff --git a/configuration/mysql/virtual_domains_maps.cf b/postfix/mysql/virtual_domains_maps.cf
similarity index 100%
rename from configuration/mysql/virtual_domains_maps.cf
rename to postfix/mysql/virtual_domains_maps.cf

diff --git a/configuration/mysql/virtual_mailbox_limits.cf b/postfix/mysql/virtual_mailbox_limits.cf
similarity index 100%
rename from configuration/mysql/virtual_mailbox_limits.cf
rename to postfix/mysql/virtual_mailbox_limits.cf

diff --git a/configuration/mysql/virtual_mailbox_maps.cf b/postfix/mysql/virtual_mailbox_maps.cf
similarity index 100%
rename from configuration/mysql/virtual_mailbox_maps.cf
rename to postfix/mysql/virtual_mailbox_maps.cf

diff --git a/configuration/postgrey_whitelist_clients.local b/postfix/postgrey_whitelist_clients.local
similarity index 100%
rename from configuration/postgrey_whitelist_clients.local
rename to postfix/postgrey_whitelist_clients.local

diff --git a/configuration/postgrey_whitelist_recipients b/postfix/postgrey_whitelist_recipients
similarity index 100%
rename from configuration/postgrey_whitelist_recipients
rename to postfix/postgrey_whitelist_recipients

diff --git a/configuration/rbl_override b/postfix/rbl_override
similarity index 100%
rename from configuration/rbl_override
rename to postfix/rbl_override

diff --git a/postfixadmin/Makefile b/postfixadmin/Makefile
new file mode 100644 (file)
index 0000000..85487e2
--- /dev/null
+++ b/postfixadmin/Makefile
@@ -0,0 +1,2 @@
+all:
+       ./setup-postfixadmin.sh

diff --git a/config.local.php b/postfixadmin/config.local.php
similarity index 100%
rename from config.local.php
rename to postfixadmin/config.local.php

diff --git a/postfixadmin.conf b/postfixadmin/postfixadmin.conf
similarity index 100%
rename from postfixadmin.conf
rename to postfixadmin/postfixadmin.conf

diff --git a/setup-postfix.sh b/postfixadmin/setup-postfixadmin.sh
similarity index 100%
rename from setup-postfix.sh
rename to postfixadmin/setup-postfixadmin.sh