Update to 2020-05-18 10:00

4 years ago · f1a2676338
parent ed525d7fae
commit f1a2676338
2 changed files with 5 additions and 1 deletions
--- 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 }}"

 ...
--- 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