From 72811f0f48cad07351ab5c5224616383a6920add Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Mon, 24 Dec 2018 23:26:35 +0100 Subject: misc --- ansible/roles/packages/tasks/main.yml | 1 + ansible/roles/trygvis-base/defaults/main.yml | 10 +++++----- ansible/roles/trygvis-base/handlers/main.yml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'ansible/roles') diff --git a/ansible/roles/packages/tasks/main.yml b/ansible/roles/packages/tasks/main.yml index 45077cc..53ebf20 100644 --- a/ansible/roles/packages/tasks/main.yml +++ b/ansible/roles/packages/tasks/main.yml @@ -38,6 +38,7 @@ - name: Enable backports repository by default when: packages__enable_backports + become: yes copy: dest: /etc/apt/preferences.d/bitraf-packages content: | diff --git a/ansible/roles/trygvis-base/defaults/main.yml b/ansible/roles/trygvis-base/defaults/main.yml index f469304..8244bbf 100644 --- a/ansible/roles/trygvis-base/defaults/main.yml +++ b/ansible/roles/trygvis-base/defaults/main.yml @@ -1,7 +1,7 @@ -bitraf_base__etc_localtime: yes -bitraf_base__remove_root_authorized_keys: yes -bitraf_base__fix_aliases: yes +trygvis_base__etc_localtime: yes +trygvis_base__remove_root_authorized_keys: yes +trygvis_base__fix_aliases: yes # These mostly applies to LXC hosts -bitraf_base__fix_hosts: no -bitraf_base__syslog: no +trygvis_base__fix_hosts: no +trygvis_base__syslog: no diff --git a/ansible/roles/trygvis-base/handlers/main.yml b/ansible/roles/trygvis-base/handlers/main.yml index c0b601c..f06ad24 100644 --- a/ansible/roles/trygvis-base/handlers/main.yml +++ b/ansible/roles/trygvis-base/handlers/main.yml @@ -4,4 +4,4 @@ - name: postalias /etc/aliases become: yes - shell: "[ -x /usr/sbin/postalias ] && /usr/sbin/postalias /etc/aliases" + shell: "[ ! -x /usr/sbin/postalias ] || /usr/sbin/postalias /etc/aliases" -- cgit v1.2.3