diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml index cb9d475..5d8e9bf 100644 --- a/roles/common/defaults/main.yml +++ b/roles/common/defaults/main.yml @@ -105,7 +105,7 @@ system_tz: 'Europe/Paris' # system_tuned_profile: enterprise-storage # Frquency of the fstrim cron job. Can be daily, weekly or monthly -system_fstrim_freq: daily +system_fstrim_freq: weekly system_base_bash_aliases: ls: 'ls $LS_OPTIONS' diff --git a/roles/system_proxy/tasks/main.yml b/roles/system_proxy/tasks/main.yml index c9f37ff..9e572fd 100644 --- a/roles/system_proxy/tasks/main.yml +++ b/roles/system_proxy/tasks/main.yml @@ -51,4 +51,22 @@ when: ansible_os_family == 'RedHat' tags: proxy -# TODO: equivalent for apt +- name: Config proxy for apt + copy: + content: | + Acquire::http::Proxy "{{ system_proxy }}"; + Acquire::https::Proxy "{{ system_proxy }}"; + dest: /etc/apt/apt.conf.d/10proxy + when: + - ansible_os_family == 'Debian' + - system_proxy is defined + - system_proxy != '' + tags: proxy + +- name: Remove proxy from apt config + file: path=/etc/apt/apt.conf.d/10proxy state=absent + when: + - ansible_os_family == 'Debian' + - system_proxy is not defined or system_proxy == '' + tags: proxy + diff --git a/roles/wapt_server/tasks/main.yml b/roles/wapt_server/tasks/main.yml index af9ee68..379799a 100644 --- a/roles/wapt_server/tasks/main.yml +++ b/roles/wapt_server/tasks/main.yml @@ -5,7 +5,7 @@ name: - tis-waptserver - tis-waptsetup - - postgresql11 + - postgresql12 - python-psycopg2 # Needed to manage PG with ansible tags: wapt