From f1a267633890f71f9de0bc60329b349c3f24869e Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 18 May 2020 10:00:06 +0200 Subject: [PATCH] Update to 2020-05-18 10:00 --- roles/common/defaults/main.yml | 4 +++- roles/repo_zabbix/tasks/Debian.yml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml index 9b71a98..cb9d475 100644 --- a/roles/common/defaults/main.yml +++ b/roles/common/defaults/main.yml @@ -119,6 +119,8 @@ system_extra_bash_aliases: {} system_bash_aliases: "{{ system_base_bash_aliases | combine(system_extra_bash_aliases, recursive=True) }}" # shell scriplet to exec on boot -system_rc_local_cmd: [] +system_rc_local_base_cmd: [] +system_rc_local_extra_cmd: [] +system_rc_local_cmd: "{{ system_rc_local_base_cmd + system_rc_local_extra_cmd }}" ... diff --git a/roles/repo_zabbix/tasks/Debian.yml b/roles/repo_zabbix/tasks/Debian.yml index 729756b..224d86d 100644 --- a/roles/repo_zabbix/tasks/Debian.yml +++ b/roles/repo_zabbix/tasks/Debian.yml @@ -2,6 +2,8 @@ - name: Add Zabbix repo key apt_key: url: https://repo.zabbix.com/zabbix-official-repo.key + environment: + https_proxy: "{{ system_proxy | default('') }}" tags: repo - name: Add Zabbix repo