From 6421af70c4bfa83eb45b7c558100190c5e932d60 Mon Sep 17 00:00:00 2001
From: fatalerrors <geoffray.levasseurbrandin@numericable.fr>
Date: Fri, 2 Jul 2021 17:16:52 +0200
Subject: [PATCH] implemented correct conf_mail.sh

---
 conf/init.conf.sh           |  2 +-
 modules/conf_mail.sh        | 10 ++++++---
 repo/common/postfix_main.cf | 44 +++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 repo/common/postfix_main.cf

diff --git a/conf/init.conf.sh b/conf/init.conf.sh
index 473febc..efe4b72 100644
--- a/conf/init.conf.sh
+++ b/conf/init.conf.sh
@@ -65,4 +65,4 @@ export FORCEBLANK=false
 
 # Liste des modules à executer (surchargeable en ligne de commande)
 export MODULE_LIST="upgrade_dist conf_disks conf_locale conf_ntp conf_ssh \
-		 install_desktop install_pkg install_chromium"
+		 conf_mail install_desktop install_pkg install_chromium"
diff --git a/modules/conf_mail.sh b/modules/conf_mail.sh
index 56dfabb..9bd7551 100644
--- a/modules/conf_mail.sh
+++ b/modules/conf_mail.sh
@@ -1,12 +1,16 @@
 # Mail systême
 
-export VER_conf_mail="0.0.1"
+export VER_conf_mail="0.0.2"
 
 conf_mail()
 {
+    prnt I "Installation de postfix..."
+    pkginst postfix
+    
     prnt I "Configuration de postfix..."
-    installfile postfix.cf /etc/postfix/main.cf
-    sed -i -e "s/#HOSTNAME#/$HOSTNAME/g" /etc/postfix/main.cf
+    installfile postfix_main.cf /etc/postfix/main.cf
+    sed -i -e "s/@HOSTNAME@/$HOSTNAME/g" /etc/postfix/main.cf
+    echo $HOSTNAME.$MAINDOM > /etc/mailname
     svc_restart postfix
 }
 
diff --git a/repo/common/postfix_main.cf b/repo/common/postfix_main.cf
new file mode 100644
index 0000000..3742318
--- /dev/null
+++ b/repo/common/postfix_main.cf
@@ -0,0 +1,44 @@
+# See /usr/share/postfix/main.cf.dist for a commented, more complete version
+
+# Debian specific:  Specifying a file name will cause the first
+# line of that file to be used as the name.  The Debian default
+# is /etc/mailname.
+#myorigin = /etc/mailname
+
+smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU)
+biff = no
+
+# appending .domain is the MUA's job.
+append_dot_mydomain = no
+
+# Uncomment the next line to generate "delayed mail" warnings
+#delay_warning_time = 4h
+
+readme_directory = no
+
+# See http://www.postfix.org/COMPATIBILITY_README.html -- default to 2 on
+# fresh installs.
+compatibility_level = 2
+
+# TLS parameters
+smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
+smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
+smtpd_use_tls=yes
+smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
+smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
+
+# See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
+# information on enabling SSL in the smtp client.
+
+#smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
+myhostname = @HOSTNAME@.geoffray-levasseur.org
+alias_maps = hash:/etc/aliases
+alias_database = hash:/etc/aliases
+myorigin = /etc/mailname
+mydestination = false
+relayhost = [smtp.legos.obs-mip.fr]
+mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
+mailbox_size_limit = 0
+recipient_delimiter = +
+inet_interfaces = loopback-only
+inet_protocols = ipv4