From 97dcf9d3611d14ae41b828d7b1bd9469e13b7549 Mon Sep 17 00:00:00 2001
From: Pierre Jaury <pierre@jaury.eu>
Date: Mon, 18 Jan 2016 21:43:52 +0100
Subject: [PATCH] Import and clean vmm provided configuration files

---
 config/dovecot/conf.d/10-auth.conf            | 13 +++++
 config/dovecot/conf.d/10-mail.conf            |  6 +++
 config/dovecot/conf.d/10-master.conf          | 43 +++++++++++++++
 config/dovecot/conf.d/10-ssl.conf             |  4 ++
 config/dovecot/conf.d/15-lda.conf             |  6 +++
 config/dovecot/conf.d/20-imap.conf            |  3 ++
 config/dovecot/conf.d/20-lmtp.conf            |  3 ++
 config/dovecot/dovecot-sql.conf.ext           | 18 +++++++
 config/dovecot/dovecot.conf                   |  2 +
 config/postfix/main.cf                        | 33 ++++++++++++
 config/postfix/master.cf                      | 52 +++++++++++++++++++
 config/postfix/pgsql-relocated_maps.cf        | 14 +++++
 .../postfix/pgsql-smtpd_sender_login_maps.cf  | 18 +++++++
 config/postfix/pgsql-transport_maps.cf        | 14 +++++
 config/postfix/pgsql-virtual_alias_maps.cf    | 14 +++++
 config/postfix/pgsql-virtual_gid_maps.cf      | 14 +++++
 .../postfix/pgsql-virtual_mailbox_domains.cf  | 14 +++++
 config/postfix/pgsql-virtual_mailbox_maps.cf  | 14 +++++
 config/postfix/pgsql-virtual_uid_maps.cf      | 14 +++++
 19 files changed, 299 insertions(+)
 create mode 100644 config/dovecot/conf.d/10-auth.conf
 create mode 100644 config/dovecot/conf.d/10-mail.conf
 create mode 100644 config/dovecot/conf.d/10-master.conf
 create mode 100644 config/dovecot/conf.d/10-ssl.conf
 create mode 100644 config/dovecot/conf.d/15-lda.conf
 create mode 100644 config/dovecot/conf.d/20-imap.conf
 create mode 100644 config/dovecot/conf.d/20-lmtp.conf
 create mode 100644 config/dovecot/dovecot-sql.conf.ext
 create mode 100644 config/postfix/pgsql-relocated_maps.cf
 create mode 100644 config/postfix/pgsql-smtpd_sender_login_maps.cf
 create mode 100644 config/postfix/pgsql-transport_maps.cf
 create mode 100644 config/postfix/pgsql-virtual_alias_maps.cf
 create mode 100644 config/postfix/pgsql-virtual_gid_maps.cf
 create mode 100644 config/postfix/pgsql-virtual_mailbox_domains.cf
 create mode 100644 config/postfix/pgsql-virtual_mailbox_maps.cf
 create mode 100644 config/postfix/pgsql-virtual_uid_maps.cf

diff --git a/config/dovecot/conf.d/10-auth.conf b/config/dovecot/conf.d/10-auth.conf
new file mode 100644
index 00000000..3bc3bc78
--- /dev/null
+++ b/config/dovecot/conf.d/10-auth.conf
@@ -0,0 +1,13 @@
+auth_mechanisms = plain login cram-md5
+
+passdb {
+  driver = sql
+  args = /etc/dovecot/dovecot-sql.conf.ext
+}
+
+userdb {
+  driver = sql
+  args = /etc/dovecot/dovecot-sql.conf.ext
+}
+
+#!include auth-system.conf.ext
diff --git a/config/dovecot/conf.d/10-mail.conf b/config/dovecot/conf.d/10-mail.conf
new file mode 100644
index 00000000..a982cbcd
--- /dev/null
+++ b/config/dovecot/conf.d/10-mail.conf
@@ -0,0 +1,6 @@
+# mailbox configuration
+
+first_valid_gid = 70000
+first_valid_uid = 70000
+mail_access_groups = mail
+mail_location = maildir:~/Maildir
diff --git a/config/dovecot/conf.d/10-master.conf b/config/dovecot/conf.d/10-master.conf
new file mode 100644
index 00000000..47d525df
--- /dev/null
+++ b/config/dovecot/conf.d/10-master.conf
@@ -0,0 +1,43 @@
+service imap-login {
+  inet_listener imap {
+    port = 143
+  }
+  inet_listener imaps {
+    port = 993
+  }
+}
+
+service lmtp {
+  unix_listener /var/spool/postfix/private/dovecot-lmtp {
+    user = postfix
+    group = postfix
+    mode = 0600
+  }
+}
+
+service auth {
+  user = doveauth
+  unix_listener auth-userdb {
+  }
+  unix_listener /var/spool/postfix/private/dovecot-auth {
+    user = postfix
+    group = postfix
+    mode = 0600
+  }
+}
+
+service auth-worker {
+  unix_listener auth-worker {
+    user = mail
+    group = $default_internal_user
+    mode = 0660
+  }
+  user = mail
+}
+
+service dict {
+  unix_listener dict {
+    group = mail
+    mode = 0660
+  }
+}
diff --git a/config/dovecot/conf.d/10-ssl.conf b/config/dovecot/conf.d/10-ssl.conf
new file mode 100644
index 00000000..a78ba85e
--- /dev/null
+++ b/config/dovecot/conf.d/10-ssl.conf
@@ -0,0 +1,4 @@
+# SSL/TLS support
+ssl = yes
+ssl_cert = </etc/ssl/cert.pem
+ssl_key = </etc/ssl/key.pem
diff --git a/config/dovecot/conf.d/15-lda.conf b/config/dovecot/conf.d/15-lda.conf
new file mode 100644
index 00000000..2654d8d3
--- /dev/null
+++ b/config/dovecot/conf.d/15-lda.conf
@@ -0,0 +1,6 @@
+# delivery configuration
+postmaster_address = admin@domain.tld
+recipient_delimiter = +
+protocol lda {
+
+}
diff --git a/config/dovecot/conf.d/20-imap.conf b/config/dovecot/conf.d/20-imap.conf
new file mode 100644
index 00000000..4db12a86
--- /dev/null
+++ b/config/dovecot/conf.d/20-imap.conf
@@ -0,0 +1,3 @@
+# mail browsing
+protocol imap {
+}
diff --git a/config/dovecot/conf.d/20-lmtp.conf b/config/dovecot/conf.d/20-lmtp.conf
new file mode 100644
index 00000000..45eb11a4
--- /dev/null
+++ b/config/dovecot/conf.d/20-lmtp.conf
@@ -0,0 +1,3 @@
+# mail delivery
+protocol lmtp {
+}
diff --git a/config/dovecot/dovecot-sql.conf.ext b/config/dovecot/dovecot-sql.conf.ext
new file mode 100644
index 00000000..86bc85b3
--- /dev/null
+++ b/config/dovecot/dovecot-sql.conf.ext
@@ -0,0 +1,18 @@
+driver = pgsql
+connect = host=localhost dbname=mailsys user=dovecot password=$Dovecot_PASS
+
+password_query = \
+ SELECT userid AS "user", password FROM dovecotpassword('%Ln', '%Ld') WHERE %Ls
+
+# uncomment this user_query if you want to use the quota plugin
+#user_query = \
+# SELECT home, uid, gid, mail, quota_rule FROM dovecotquotauser('%Ln', '%Ld')
+
+# otherwise uncomment the following user_query
+#user_query = SELECT home, uid, gid, mail FROM dovecotuser('%Ln', '%Ld')
+
+iterate_query = \
+ SELECT local_part AS username, domain_name.domainname AS domain \
+   FROM users \
+        LEFT JOIN domain_data USING (gid) \
+        LEFT JOIN domain_name USING (gid)
diff --git a/config/dovecot/dovecot.conf b/config/dovecot/dovecot.conf
index e69de29b..b0c4839b 100644
--- a/config/dovecot/dovecot.conf
+++ b/config/dovecot/dovecot.conf
@@ -0,0 +1,2 @@
+# handled protocols
+protocols = imap lmtp
diff --git a/config/postfix/main.cf b/config/postfix/main.cf
index e69de29b..22e7ac4d 100644
--- a/config/postfix/main.cf
+++ b/config/postfix/main.cf
@@ -0,0 +1,33 @@
+# aliases
+sql      = pgsql:${config_directory}/
+proxysql = proxy:${sql}
+
+# relocated users from the database
+relocated_maps = ${proxysql}pgsql-relocated_maps.cf
+
+# transport settings from our database
+transport_maps = ${proxysql}pgsql-transport_maps.cf
+
+# virtual domains, mailboxes and aliases
+virtual_mailbox_domains = ${proxysql}pgsql-virtual_mailbox_domains.cf
+virtual_alias_maps = ${proxysql}pgsql-virtual_alias_maps.cf
+virtual_minimum_uid = 70000
+virtual_uid_maps = ${sql}pgsql-virtual_uid_maps.cf
+virtual_gid_maps = ${sql}pgsql-virtual_gid_maps.cf
+virtual_mailbox_base = /
+virtual_mailbox_maps = ${proxysql}pgsql-virtual_mailbox_maps.cf
+
+# delivery transport
+virtual_transport = lmtp:unix:private/dovecot-lmtp
+
+# dovecot SASL
+smtpd_sasl_type = dovecot
+smtpd_sasl_path = private/dovecot-auth
+smtpd_sasl_auth_enable = yes
+smtpd_sasl_security_options = noplaintext, noanonymous
+
+# submission restrictions
+smtpd_recipient_restrictions =
+ permit_mynetworks
+ permit_sasl_authenticated
+ reject_unauth_destination
diff --git a/config/postfix/master.cf b/config/postfix/master.cf
index e69de29b..fe8a39fb 100644
--- a/config/postfix/master.cf
+++ b/config/postfix/master.cf
@@ -0,0 +1,52 @@
+# service type  private unpriv  chroot  wakeup  maxproc command + args
+#               (yes)   (yes)   (yes)   (never) (100)
+
+# main SMTP services
+smtp      inet  n       -       -       -       -       smtpd
+submission inet n       -       -       -       -       smtpd
+  -o syslog_name=postfix/submission
+  -o smtpd_tls_security_level=encrypt
+  -o smtpd_sasl_auth_enable=yes
+  -o smtpd_reject_unlisted_recipient=no
+  -o smtpd_client_restrictions=$mua_client_restrictions
+  -o smtpd_helo_restrictions=$mua_helo_restrictions
+  -o smtpd_sender_restrictions=$mua_sender_restrictions
+  -o smtpd_recipient_restrictions=
+  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
+  -o milter_macro_daemon_name=ORIGINATING
+smtps     inet  n       -       -       -       -       smtpd
+  -o syslog_name=postfix/smtps
+  -o smtpd_tls_wrappermode=yes
+  -o smtpd_sasl_auth_enable=yes
+  -o smtpd_reject_unlisted_recipient=no
+  -o smtpd_client_restrictions=$mua_client_restrictions
+  -o smtpd_helo_restrictions=$mua_helo_restrictions
+  -o smtpd_sender_restrictions=$mua_sender_restrictions
+  -o smtpd_recipient_restrictions=
+  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
+  -o milter_macro_daemon_name=ORIGINATING
+
+# internal postfix services
+pickup    unix  n       -       -       60      1       pickup
+cleanup   unix  n       -       -       -       0       cleanup
+qmgr      unix  n       -       n       300     1       qmgr
+tlsmgr    unix  -       -       -       1000?   1       tlsmgr
+rewrite   unix  -       -       -       -       -       trivial-rewrite
+bounce    unix  -       -       -       -       0       bounce
+defer     unix  -       -       -       -       0       bounce
+trace     unix  -       -       -       -       0       bounce
+verify    unix  -       -       -       -       1       verify
+flush     unix  n       -       -       1000?   0       flush
+proxymap  unix  -       -       n       -       -       proxymap
+proxywrite unix -       -       n       -       1       proxymap
+smtp      unix  -       -       -       -       -       smtp
+relay     unix  -       -       -       -       -       smtp
+showq     unix  n       -       -       -       -       showq
+error     unix  -       -       -       -       -       error
+retry     unix  -       -       -       -       -       error
+discard   unix  -       -       -       -       -       discard
+local     unix  -       n       n       -       -       local
+virtual   unix  -       n       n       -       -       virtual
+lmtp      unix  -       -       -       -       -       lmtp
+anvil     unix  -       -       -       -       1       anvil
+scache    unix  -       -       -       -       1       scache
diff --git a/config/postfix/pgsql-relocated_maps.cf b/config/postfix/pgsql-relocated_maps.cf
new file mode 100644
index 00000000..c4ac096b
--- /dev/null
+++ b/config/postfix/pgsql-relocated_maps.cf
@@ -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_map('%u', '%d')
diff --git a/config/postfix/pgsql-smtpd_sender_login_maps.cf b/config/postfix/pgsql-smtpd_sender_login_maps.cf
new file mode 100644
index 00000000..8a7a8e3c
--- /dev/null
+++ b/config/postfix/pgsql-smtpd_sender_login_maps.cf
@@ -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')
diff --git a/config/postfix/pgsql-transport_maps.cf b/config/postfix/pgsql-transport_maps.cf
new file mode 100644
index 00000000..b2200574
--- /dev/null
+++ b/config/postfix/pgsql-transport_maps.cf
@@ -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_map('%u', '%d')
diff --git a/config/postfix/pgsql-virtual_alias_maps.cf b/config/postfix/pgsql-virtual_alias_maps.cf
new file mode 100644
index 00000000..afe11342
--- /dev/null
+++ b/config/postfix/pgsql-virtual_alias_maps.cf
@@ -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_virtual_alias_map('%u', '%d')
diff --git a/config/postfix/pgsql-virtual_gid_maps.cf b/config/postfix/pgsql-virtual_gid_maps.cf
new file mode 100644
index 00000000..60cd1e39
--- /dev/null
+++ b/config/postfix/pgsql-virtual_gid_maps.cf
@@ -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'
diff --git a/config/postfix/pgsql-virtual_mailbox_domains.cf b/config/postfix/pgsql-virtual_mailbox_domains.cf
new file mode 100644
index 00000000..7624e36b
--- /dev/null
+++ b/config/postfix/pgsql-virtual_mailbox_domains.cf
@@ -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'
diff --git a/config/postfix/pgsql-virtual_mailbox_maps.cf b/config/postfix/pgsql-virtual_mailbox_maps.cf
new file mode 100644
index 00000000..3ae8ba1c
--- /dev/null
+++ b/config/postfix/pgsql-virtual_mailbox_maps.cf
@@ -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_virtual_mailbox_map('%u', '%d')
diff --git a/config/postfix/pgsql-virtual_uid_maps.cf b/config/postfix/pgsql-virtual_uid_maps.cf
new file mode 100644
index 00000000..9c0b6357
--- /dev/null
+++ b/config/postfix/pgsql-virtual_uid_maps.cf
@@ -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_virtual_uid_map('%u', '%d')