From fc49b4de6f6ff04ad3c3adf0ef29df2c893ba0e4 Mon Sep 17 00:00:00 2001 From: Gilles Mouchet Date: Sun, 2 Jun 2024 13:39:31 +0200 Subject: [PATCH] add postfix --- files/os/gmo-cfg.sh | 9 +++++++-- main.yml | 13 +++++++++++-- roles/requirements.yml | 3 +++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/files/os/gmo-cfg.sh b/files/os/gmo-cfg.sh index 74e9647..b4cff89 100644 --- a/files/os/gmo-cfg.sh +++ b/files/os/gmo-cfg.sh @@ -33,12 +33,17 @@ alias sudo='sudo --preserve-env=PATH env' # https://www.petefreitag.com/blog/env if ! is_scp; then if [[ "$USER" == "gilles" || "$USER" == "root" ]]; then + host_fqdn=$(hostname) + host_shot=$(hostname s) + ip=$(hostname -I) dist=$(cat /etc/redhat-release) kern=$(uname -r) cat << EOF ----------------------------------------------------- -Distribution: $dist - Kernel: $kern + Host name (fqdn): $host_fqdn +Host name (short): $host_short + Distribution: $dist + Kernel: $kern ----------------------------------------------------- EOF fi diff --git a/main.yml b/main.yml index 9087b24..e48bef8 100644 --- a/main.yml +++ b/main.yml @@ -1,14 +1,23 @@ --- - hosts: localhost + vars: + mail_relay_host: smtp.gmail.com + mail_domain: gmeech.dyndns.org + tasks: - include_tasks: assert-vars.yml - include_tasks: disable-ipv6.yml - include_tasks: hosts.yml - include_tasks: inst-packages.yml - include_tasks: misc.yml + - include_tasks: potfix.yml - - name: import netdata role + - name: import postfix role import_role: - name: role-netdata + name: role-posfix + +# - name: import netdata role +# import_role: +# name: role-netdata \ No newline at end of file diff --git a/roles/requirements.yml b/roles/requirements.yml index 30f8952..e615050 100644 --- a/roles/requirements.yml +++ b/roles/requirements.yml @@ -1,4 +1,7 @@ --- +- name: role-postfix + src: git+https://gitweb.dyndns.org/awx/role-postfix.git + - name: role-netdata src: git+https://gitweb.dyndns.org/awx/role_netdata.git