summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Yann Wettengel <niyawe@niyawe.de>2017-03-20 20:57:17 +0100
committerNiklas Yann Wettengel <niyawe@niyawe.de>2017-03-20 20:57:17 +0100
commit354f025149be9923441af9f64cf153b21f46aff5 (patch)
treefe50108e4976bfb90a3b3c562b672b6ab468ef8f
parenteade06a930c16f5cb08edd454d9e41364edf8103 (diff)
use ansible_fqdn instead of ansible_nodename
-rw-r--r--roles/install_monitoring/templates/munin-node.conf.j22
-rw-r--r--roles/install_ssmtp/templates/ssmtp.conf.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/install_monitoring/templates/munin-node.conf.j2 b/roles/install_monitoring/templates/munin-node.conf.j2
index 309833a..8b1f7e8 100644
--- a/roles/install_monitoring/templates/munin-node.conf.j2
+++ b/roles/install_monitoring/templates/munin-node.conf.j2
@@ -30,7 +30,7 @@ ignore_file \.pod$
# Set this if the client doesn't report the correct hostname when
# telnetting to localhost, port 4949
#
-host_name {{ ansible_nodename }}
+host_name {{ ansible_fqdn }}
# A list of addresses that are allowed to connect. This must be a
# regular expression, since Net::Server does not understand CIDR-style
diff --git a/roles/install_ssmtp/templates/ssmtp.conf.j2 b/roles/install_ssmtp/templates/ssmtp.conf.j2
index 486e047..bf5cd8f 100644
--- a/roles/install_ssmtp/templates/ssmtp.conf.j2
+++ b/roles/install_ssmtp/templates/ssmtp.conf.j2
@@ -1,6 +1,6 @@
root=root=root@niyawe.de
mailhub=mail.niyawe.de:465
rewriteDomain=niyawe.de
-hostname={{ ansible_nodename }}
+hostname={{ ansible_fqdn }}
FromLineOverride=YES
UseTLS=YES