WIP.

diff --git a/all_new_2018/apt-mark/server b/all_new_2018/apt-mark/server
index c7db7a4c5dd440963135e6fbff1cb5ef83f67f47..d3a23331484938fd97d85f3f878490ff0f17ad15 100644 (file)
--- a/all_new_2018/apt-mark/server
+++ b/all_new_2018/apt-mark/server
@@ -7,4 +7,5 @@ certbot
 # for letsencrypt renewal
 cron
 # provides systemd scripts that configure iptables via /etc/iptables/*
-iptables-persistent
\ No newline at end of file
+iptables-persistent
+# this line is here because the shell "read" in install_for_target.sh ignores lines without final newline
\ No newline at end of file

diff --git a/all_new_2018/linkable_etc_files/server/etc/postfix/main.cf b/all_new_2018/linkable_etc_files/server/etc/postfix/main.cf
index b97738b58e8483e904493273002bc48abb59f875..7e389571625953b96e7c3547c0d0f10c6289efd4 100644 (file)
--- a/all_new_2018/linkable_etc_files/server/etc/postfix/main.cf
+++ b/all_new_2018/linkable_etc_files/server/etc/postfix/main.cf
@@ -30,11 +30,11 @@ smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
 # information on enabling SSL in the smtp client.
 
 smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
-myhostname = moil.plomlompom.com
+myorigin = /etc/mailname
+myhostname = $myorigin
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
-myorigin = /etc/mailname
-mydestination = $myhostname, moil.plomlompom.com, localhost.plomlompom.com, localhost
+mydestination = $myhostname, localhost.plomlompom.com, localhost
 relayhost = 
 mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mailbox_size_limit = 0