--- a/install.sh	Thu Oct 22 18:40:06 2009 +0000
+++ b/install.sh	Thu Oct 22 19:30:46 2009 +0000
@@ -30,7 +30,7 @@
 python setup.py clean --all >/dev/null
 
 install -b -m 0600 ${INSTALL_OPTS} vmm.cfg ${PREFIX}/etc/
-install ${INSTALL_OPTS_CF} pgsql-*.cf ${PF_CONFDIR}/
+install ${INSTALL_OPTS_CF} postfix/pgsql-*.cf ${PF_CONFDIR}/
 install -m 0700 ${INSTALL_OPTS} vmm ${PREFIX}/sbin
 
 [ -d ${LOCALE_DIR} ] || mkdir -m 0755 -p ${LOCALE_DIR}
@@ -70,7 +70,7 @@
 done
 
 [ -d ${DOC_DIR}/examples ] || mkdir -m 0755 -p ${DOC_DIR}/examples
-install -m 0644 ${INSTALL_OPTS} pgsql-*.cf ${DOC_DIR}/examples
+install -m 0644 ${INSTALL_OPTS} postfix/pgsql-*.cf ${DOC_DIR}/examples
 install -m 0644 ${INSTALL_OPTS} vmm.cfg ${DOC_DIR}/examples
 
 echo

--- a/pgsql-relocated_maps.cf	Thu Oct 22 18:40:06 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
-#
-# The hosts that Postfix will try to connect to and query from.
-hosts = localhost
-
-# The user name and password to log into the pgsql server.
-user = postfix
-password = some_password
-
-# The database name on the servers.
-dbname = mailsys
-
-# The SQL query template used to search the database
-query = SELECT destination FROM postfix_relocated WHERE address='%s'

--- a/pgsql-smtpd_sender_login_maps.cf	Thu Oct 22 18:40:06 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
-#
-# The hosts that Postfix will try to connect to and query from.
-hosts = localhost
-
-# The user name and password to log into the pgsql server.
-user = postfix
-password = some_password
-
-# The database name on the servers.
-dbname = mailsys
-
-# XXX see create_optional_types_and_functions.pgsql
-# 	* line  9: type sender_login
-# 	* line 26: function postfix_smtpd_sender_login_map + comment above
-#
-# The SQL query template used to search the database
-#query = SELECT login FROM postfix_smtpd_sender_login_map('%u', '%d')

--- a/pgsql-transport.cf	Thu Oct 22 18:40:06 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
-#
-# The hosts that Postfix will try to connect to and query from.
-hosts = localhost
-
-# The user name and password to log into the pgsql server.
-user = postfix
-password = some_password
-
-# The database name on the servers.
-dbname = mailsys
-
-# The SQL query template used to search the database
-query = SELECT transport FROM postfix_transport WHERE address='%s'

--- a/pgsql-virtual_alias_maps.cf	Thu Oct 22 18:40:06 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
-#
-# The hosts that Postfix will try to connect to and query from.
-hosts = localhost
-
-# The user name and password to log into the pgsql server.
-user = postfix
-password = some_password
-
-# The database name on the servers.
-dbname = mailsys
-
-# The SQL query template used to search the database
-query = SELECT destination FROM postfix_alias WHERE address='%s'

--- a/pgsql-virtual_gid_maps.cf	Thu Oct 22 18:40:06 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
-#
-# The hosts that Postfix will try to connect to and query from.
-hosts = localhost
-
-# The user name and password to log into the pgsql server.
-user = postfix
-password = some_password
-
-# The database name on the servers.
-dbname = mailsys
-
-# The SQL query template used to search the database
-query = SELECT gid FROM postfix_gid WHERE domainname='%d'

--- a/pgsql-virtual_mailbox_domains.cf	Thu Oct 22 18:40:06 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
-#
-# The hosts that Postfix will try to connect to and query from.
-hosts = localhost
-
-# The user name and password to log into the pgsql server.
-user = postfix
-password = some_password
-
-# The database name on the servers.
-dbname = mailsys
-
-# The SQL query template used to search the database
-query = SELECT gid FROM postfix_gid WHERE domainname='%s'

--- a/pgsql-virtual_mailbox_maps.cf	Thu Oct 22 18:40:06 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
-#
-# The hosts that Postfix will try to connect to and query from.
-hosts = localhost
-
-# The user name and password to log into the pgsql server.
-user = postfix
-password = some_password
-
-# The database name on the servers.
-dbname = mailsys
-
-# The SQL query template used to search the database
-query = SELECT maildir FROM postfix_maildir WHERE address='%s'

--- a/pgsql-virtual_uid_maps.cf	Thu Oct 22 18:40:06 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
-#
-# The hosts that Postfix will try to connect to and query from.
-hosts = localhost
-
-# The user name and password to log into the pgsql server.
-user = postfix
-password = some_password
-
-# The database name on the servers.
-dbname = mailsys
-
-# The SQL query template used to search the database
-query = SELECT uid FROM postfix_uid WHERE address='%s'

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/postfix/pgsql-relocated_maps.cf	Thu Oct 22 19:30:46 2009 +0000
@@ -0,0 +1,14 @@
+# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
+#
+# The hosts that Postfix will try to connect to and query from.
+hosts = localhost
+
+# The user name and password to log into the pgsql server.
+user = postfix
+password = some_password
+
+# The database name on the servers.
+dbname = mailsys
+
+# The SQL query template used to search the database
+query = SELECT destination FROM postfix_relocated WHERE address='%s'

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/postfix/pgsql-smtpd_sender_login_maps.cf	Thu Oct 22 19:30:46 2009 +0000
@@ -0,0 +1,18 @@
+# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
+#
+# The hosts that Postfix will try to connect to and query from.
+hosts = localhost
+
+# The user name and password to log into the pgsql server.
+user = postfix
+password = some_password
+
+# The database name on the servers.
+dbname = mailsys
+
+# XXX see create_optional_types_and_functions.pgsql
+# 	* line  9: type sender_login
+# 	* line 26: function postfix_smtpd_sender_login_map + comment above
+#
+# The SQL query template used to search the database
+#query = SELECT login FROM postfix_smtpd_sender_login_map('%u', '%d')

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/postfix/pgsql-transport.cf	Thu Oct 22 19:30:46 2009 +0000
@@ -0,0 +1,14 @@
+# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
+#
+# The hosts that Postfix will try to connect to and query from.
+hosts = localhost
+
+# The user name and password to log into the pgsql server.
+user = postfix
+password = some_password
+
+# The database name on the servers.
+dbname = mailsys
+
+# The SQL query template used to search the database
+query = SELECT transport FROM postfix_transport WHERE address='%s'

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/postfix/pgsql-virtual_alias_maps.cf	Thu Oct 22 19:30:46 2009 +0000
@@ -0,0 +1,14 @@
+# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
+#
+# The hosts that Postfix will try to connect to and query from.
+hosts = localhost
+
+# The user name and password to log into the pgsql server.
+user = postfix
+password = some_password
+
+# The database name on the servers.
+dbname = mailsys
+
+# The SQL query template used to search the database
+query = SELECT destination FROM postfix_alias WHERE address='%s'

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/postfix/pgsql-virtual_gid_maps.cf	Thu Oct 22 19:30:46 2009 +0000
@@ -0,0 +1,14 @@
+# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
+#
+# The hosts that Postfix will try to connect to and query from.
+hosts = localhost
+
+# The user name and password to log into the pgsql server.
+user = postfix
+password = some_password
+
+# The database name on the servers.
+dbname = mailsys
+
+# The SQL query template used to search the database
+query = SELECT gid FROM postfix_gid WHERE domainname='%d'

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/postfix/pgsql-virtual_mailbox_domains.cf	Thu Oct 22 19:30:46 2009 +0000
@@ -0,0 +1,14 @@
+# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
+#
+# The hosts that Postfix will try to connect to and query from.
+hosts = localhost
+
+# The user name and password to log into the pgsql server.
+user = postfix
+password = some_password
+
+# The database name on the servers.
+dbname = mailsys
+
+# The SQL query template used to search the database
+query = SELECT gid FROM postfix_gid WHERE domainname='%s'

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/postfix/pgsql-virtual_mailbox_maps.cf	Thu Oct 22 19:30:46 2009 +0000
@@ -0,0 +1,14 @@
+# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
+#
+# The hosts that Postfix will try to connect to and query from.
+hosts = localhost
+
+# The user name and password to log into the pgsql server.
+user = postfix
+password = some_password
+
+# The database name on the servers.
+dbname = mailsys
+
+# The SQL query template used to search the database
+query = SELECT maildir FROM postfix_maildir WHERE address='%s'

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/postfix/pgsql-virtual_uid_maps.cf	Thu Oct 22 19:30:46 2009 +0000
@@ -0,0 +1,14 @@
+# All parameters are described in pgsql_table(5) / PGSQL PARAMETERS
+#
+# The hosts that Postfix will try to connect to and query from.
+hosts = localhost
+
+# The user name and password to log into the pgsql server.
+user = postfix
+password = some_password
+
+# The database name on the servers.
+dbname = mailsys
+
+# The SQL query template used to search the database
+query = SELECT uid FROM postfix_uid WHERE address='%s'

--- a/upgrade.sh	Thu Oct 22 18:40:06 2009 +0000
+++ b/upgrade.sh	Thu Oct 22 19:30:46 2009 +0000
@@ -94,6 +94,6 @@
 done
 
 [ -d ${DOC_DIR}/examples ] || mkdir -m 0755 -p ${DOC_DIR}/examples
-install -m 0644 ${INSTALL_OPTS} pgsql-*.cf ${DOC_DIR}/examples
+install -m 0644 ${INSTALL_OPTS} postfix/pgsql-*.cf ${DOC_DIR}/examples
 install -m 0644 ${INSTALL_OPTS} vmm.cfg ${DOC_DIR}/examples