diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-03-04 09:53:26 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-03-04 09:53:26 +0000 |
| commit | 3912c73583464e3ff203e3e101325ccabcba0506 (patch) | |
| tree | 3b57620358c4c4cfe1c52702f2979876f6452aa0 /script/site-specific-install.sh | |
| parent | 2a49615ee3ea08f7952283efc0306a1ac0c23334 (diff) | |
| parent | af83354da1030c2d2fad3c63f3ccb516c4923d38 (diff) | |
Merge branch 'release/0.17' into wdtk
Conflicts:
config/general.yml-example
Diffstat (limited to 'script/site-specific-install.sh')
| -rwxr-xr-x | script/site-specific-install.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh index 8917fd577..7d47a5990 100755 --- a/script/site-specific-install.sh +++ b/script/site-specific-install.sh @@ -66,6 +66,11 @@ ensure_line_present \ /etc/postfix/main.cf 644 ensure_line_present \ + "^ *myhostname *=" \ + "myhostname = $(hostname --fqdn)" \ + /etc/postfix/main.cf 644 + +ensure_line_present \ "^do-not-reply" \ "do-not-reply-to-this-address: :blackhole:" \ /etc/aliases 644 |