From 1c928881fcc9761b598a56898b7a05868f15886d Mon Sep 17 00:00:00 2001 From: Tobias Hachmer Date: Sun, 17 Sep 2017 14:43:54 +0200 Subject: [PATCH] Retouch tasks due to 'become' defaults to True --- roles/ffmwu-build/handlers/main.yml | 3 --- roles/ffmwu-build/tasks/git-repos.yml | 1 + roles/git-fastd-peers/tasks/main.yml | 2 ++ roles/git-repos/tasks/main.yml | 3 +-- roles/localtestvm/tasks/loctevm-provide-prereq.inc.yml | 5 +---- roles/network-batman/handlers/main.yml | 1 - roles/network-meshbridge/handlers/main.yml | 1 - roles/service-bird-ffrl/handlers/main.yml | 2 -- roles/service-bird-ffrl/tasks/main.yml | 2 -- roles/service-bird-icvpn/handlers/main.yml | 4 ---- roles/service-bird-icvpn/tasks/main.yml | 3 --- roles/service-bird/handlers/main.yml | 3 --- roles/service-dhcpd/handlers/main.yml | 1 - roles/service-haveged/handlers/main.yml | 1 - 14 files changed, 5 insertions(+), 27 deletions(-) diff --git a/roles/ffmwu-build/handlers/main.yml b/roles/ffmwu-build/handlers/main.yml index 7996492..fc9d637 100644 --- a/roles/ffmwu-build/handlers/main.yml +++ b/roles/ffmwu-build/handlers/main.yml @@ -1,15 +1,12 @@ --- - name: check apache syntax command: /usr/sbin/apachectl -t - become: true - name: restart systemd unit apache2 systemd: name: apache2 state: restarted - become: true - name: update apt cache apt: update_cache: yes - become: true diff --git a/roles/ffmwu-build/tasks/git-repos.yml b/roles/ffmwu-build/tasks/git-repos.yml index 52f1d4d..daeeb16 100644 --- a/roles/ffmwu-build/tasks/git-repos.yml +++ b/roles/ffmwu-build/tasks/git-repos.yml @@ -4,3 +4,4 @@ repo: https://github.com/freifunk-mwu/sites-ffmwu.git dest: /home/admin/clones/sites-ffmwu version: stable + become: false diff --git a/roles/git-fastd-peers/tasks/main.yml b/roles/git-fastd-peers/tasks/main.yml index 5a1ffa0..3339069 100644 --- a/roles/git-fastd-peers/tasks/main.yml +++ b/roles/git-fastd-peers/tasks/main.yml @@ -30,6 +30,7 @@ dest: "/etc/fastd/{{ item.key }}VPN/peers" update: no with_dict: "{{ meshes }}" + become: false - name: clone fastd peer intragate repos git: @@ -37,3 +38,4 @@ dest: "/etc/fastd/{{ item.key }}igVPN/peers" update: no with_dict: "{{ meshes }}" + become: false diff --git a/roles/git-repos/tasks/main.yml b/roles/git-repos/tasks/main.yml index 46d5c33..ad6703e 100644 --- a/roles/git-repos/tasks/main.yml +++ b/roles/git-repos/tasks/main.yml @@ -5,7 +5,6 @@ state: present with_items: - git - become: true - name: ensure git directory is present file: @@ -14,10 +13,10 @@ mode: 0755 owner: admin group: admin - become: true - name: clone git repositories git: repo: "{{ item.value.repo_url }}" dest: "/home/admin/clones/{{ item.key }}" with_dict: "{{ common_repos }}" + become: false diff --git a/roles/localtestvm/tasks/loctevm-provide-prereq.inc.yml b/roles/localtestvm/tasks/loctevm-provide-prereq.inc.yml index 2112b07..a310745 100644 --- a/roles/localtestvm/tasks/loctevm-provide-prereq.inc.yml +++ b/roles/localtestvm/tasks/loctevm-provide-prereq.inc.yml @@ -18,15 +18,14 @@ - name: ensure admin user user: comment="FFMWU Administrator" name=admin shell=/bin/bash state=present - become: True - name: ensure users ssh key to admin user authorized_key: user=admin key="{{ lookup('file', '~/.ssh/id_rsa.pub') }}" exclusive=no - become: True - name: ensure users ssh key to bootstrap user authorized_key: user=hein key="{{ lookup('file', '~/.ssh/id_rsa.pub') }}" + become: false - name: ensure no-pw sudo capability for admin and bootstrap user lineinfile: @@ -35,8 +34,6 @@ line: "admin,hein ALL = (root) NOPASSWD: ALL" mode: 0440 validate: visudo -c -f %s - become: True - name: from this point on prevent pw for bootstrap user user: user=hein password=X - become: True diff --git a/roles/network-batman/handlers/main.yml b/roles/network-batman/handlers/main.yml index 545dadd..6eb2fa0 100644 --- a/roles/network-batman/handlers/main.yml +++ b/roles/network-batman/handlers/main.yml @@ -3,4 +3,3 @@ systemd: name: sysfsutils state: restarted - become: true diff --git a/roles/network-meshbridge/handlers/main.yml b/roles/network-meshbridge/handlers/main.yml index 545dadd..6eb2fa0 100644 --- a/roles/network-meshbridge/handlers/main.yml +++ b/roles/network-meshbridge/handlers/main.yml @@ -3,4 +3,3 @@ systemd: name: sysfsutils state: restarted - become: true diff --git a/roles/service-bird-ffrl/handlers/main.yml b/roles/service-bird-ffrl/handlers/main.yml index 6a31b7b..7dd9273 100644 --- a/roles/service-bird-ffrl/handlers/main.yml +++ b/roles/service-bird-ffrl/handlers/main.yml @@ -3,10 +3,8 @@ systemd: name: bird state: reloaded - become: true - name: reload bird6 systemd: name: bird6 state: reloaded - become: true diff --git a/roles/service-bird-ffrl/tasks/main.yml b/roles/service-bird-ffrl/tasks/main.yml index 6c27749..3b4b03f 100644 --- a/roles/service-bird-ffrl/tasks/main.yml +++ b/roles/service-bird-ffrl/tasks/main.yml @@ -10,7 +10,6 @@ with_items: - 4 - 6 - become: true - name: write ffrl peer configuration template: @@ -23,4 +22,3 @@ with_items: - 4 - 6 - become: true diff --git a/roles/service-bird-icvpn/handlers/main.yml b/roles/service-bird-icvpn/handlers/main.yml index 1a37e5c..af1a036 100644 --- a/roles/service-bird-icvpn/handlers/main.yml +++ b/roles/service-bird-icvpn/handlers/main.yml @@ -3,13 +3,11 @@ systemd: name: bird state: reloaded - become: true - name: reload bird6 systemd: name: bird6 state: reloaded - become: true - name: set file attrs 4 file: @@ -17,7 +15,6 @@ mode: 0640 owner: bird group: bird - become: true - name: set file attrs 6 file: @@ -25,4 +22,3 @@ mode: 0640 owner: bird group: bird - become: true diff --git a/roles/service-bird-icvpn/tasks/main.yml b/roles/service-bird-icvpn/tasks/main.yml index 0570e41..c9dfd6b 100644 --- a/roles/service-bird-icvpn/tasks/main.yml +++ b/roles/service-bird-icvpn/tasks/main.yml @@ -10,7 +10,6 @@ with_items: - 4 - 6 - become: true - name: write initial icvpn roa config shell: /usr/bin/python3 /home/admin/clones/icvpn-scripts/mkroa -{{ item.key }} -f bird -x mwu -m {{ item.value.max_prefix }} -s /home/admin/clones/icvpn-meta > /etc/bird/icvpn_ipv{{ item.key }}_roa.conf @@ -25,7 +24,6 @@ max_prefix: 20 6: max_prefix: 64 - become: true - name: write icvpn bird configuration template: @@ -38,4 +36,3 @@ with_items: - 4 - 6 - become: true diff --git a/roles/service-bird/handlers/main.yml b/roles/service-bird/handlers/main.yml index 15478b4..12fe53a 100644 --- a/roles/service-bird/handlers/main.yml +++ b/roles/service-bird/handlers/main.yml @@ -2,16 +2,13 @@ - name: reload systemd systemd: daemon_reload: yes - become: true - name: reload bird systemd: name: bird state: reloaded - become: true - name: reload bird6 systemd: name: bird6 state: reloaded - become: true diff --git a/roles/service-dhcpd/handlers/main.yml b/roles/service-dhcpd/handlers/main.yml index 88a46e2..f7d522c 100644 --- a/roles/service-dhcpd/handlers/main.yml +++ b/roles/service-dhcpd/handlers/main.yml @@ -4,4 +4,3 @@ name: isc-dhcp-server enabled: yes state: restarted - become: true diff --git a/roles/service-haveged/handlers/main.yml b/roles/service-haveged/handlers/main.yml index 8c64ad5..bb7fde2 100644 --- a/roles/service-haveged/handlers/main.yml +++ b/roles/service-haveged/handlers/main.yml @@ -2,4 +2,3 @@ - name: reload systemd systemd: daemon_reload: yes - become: true