From aed61c3df6910c57dcc1e87375cc423ad54d019c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dubois?= Date: Thu, 1 Sep 2022 18:02:48 +0200 Subject: [PATCH] evomaintenance: also move defaults variables --- roles/base/defaults/main.yml | 26 -------------------------- roles/evomaintenance/defaults/main.yml | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 26 deletions(-) create mode 100644 roles/evomaintenance/defaults/main.yml diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml index 1ababc9..1e107d8 100644 --- a/roles/base/defaults/main.yml +++ b/roles/base/defaults/main.yml @@ -5,32 +5,6 @@ ntpd_servers: "ntp.evolix.net" general_alert_email: "root@localhost" general_technical_realm: "example.com" -evomaintenance_realm: "example.com" -evomaintenance_alert_email: - "evomaintenance-{{ inventory_hostname }}@{{ evomaintenance_realm }}" -evomaintenance_hostname: - "{{ inventory_hostname }}.{{ general_technical_realm }}" -evomaintenance_pg_host: null -evomaintenance_pg_passwd: null -evomaintenance_pg_db: null -evomaintenance_pg_table: null -evomaintenance_from_domain: "{{ evomaintenance_realm }}" -evomaintenance_from: "evomaintenance@{{ evomaintenance_from_domain }}" -evomaintenance_full_from: "Evomaintenance <{{ evomaintenance_from }}>" -evomaintenance_urgency_from: mama.doe@example.com -evomaintenance_urgency_tel: "06.00.00.00.00" -evomaintenance_install_vendor: false -evomaintenance_force_config: true -evomaintenance_api_endpoint: null -evomaintenance_api_key: null -evomaintenance_hook_api: true -evomaintenance_hook_db: false -evomaintenance_hook_commit: true -evomaintenance_hook_mail: true -evomaintenance_default_hosts: [] -evomaintenance_additional_hosts: [] -evomaintenance_hosts: "{{ evomaintenance_default_hosts | union(evomaintenance_additional_hosts) | unique }}" - evobsd_system_timeout: 36000 evobsd_path: "$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" cron_root_path: "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" diff --git a/roles/evomaintenance/defaults/main.yml b/roles/evomaintenance/defaults/main.yml new file mode 100644 index 0000000..23d2a83 --- /dev/null +++ b/roles/evomaintenance/defaults/main.yml @@ -0,0 +1,25 @@ +# yamllint disable rule:line-length +--- +evomaintenance_realm: "example.com" +evomaintenance_alert_email: "evomaintenance-{{ inventory_hostname }}@{{ evomaintenance_realm }}" +evomaintenance_hostname: "{{ inventory_hostname }}.{{ general_technical_realm }}" +evomaintenance_pg_host: null +evomaintenance_pg_passwd: null +evomaintenance_pg_db: null +evomaintenance_pg_table: null +evomaintenance_from_domain: "{{ evomaintenance_realm }}" +evomaintenance_from: "evomaintenance@{{ evomaintenance_from_domain }}" +evomaintenance_full_from: "Evomaintenance <{{ evomaintenance_from }}>" +evomaintenance_urgency_from: mama.doe@example.com +evomaintenance_urgency_tel: "06.00.00.00.00" +evomaintenance_install_vendor: false +evomaintenance_force_config: true +evomaintenance_api_endpoint: null +evomaintenance_api_key: null +evomaintenance_hook_api: true +evomaintenance_hook_db: false +evomaintenance_hook_commit: true +evomaintenance_hook_mail: true +evomaintenance_default_hosts: [] +evomaintenance_additional_hosts: [] +evomaintenance_hosts: "{{ evomaintenance_default_hosts | union(evomaintenance_additional_hosts) | unique }}"