From cfff327fb21864ab1249c2f4ea3614c14b802ff5 Mon Sep 17 00:00:00 2001
From: Nikita Strelkov <nikita.strelkov@gmail.com>
Date: Wed, 5 Oct 2016 21:25:16 +0500
Subject: [PATCH] Remove `sudo` and `become` from roles and use one `become` in
 playbook

---
 ansible/playbook.yml                |  2 +-
 ansible/roles/app/tasks/main.yml    |  1 -
 ansible/roles/php/tasks/main.yml    | 15 ++-------------
 ansible/roles/server/tasks/main.yml | 12 +++---------
 ansible/roles/xdebug/tasks/main.yml |  1 -
 5 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/ansible/playbook.yml b/ansible/playbook.yml
index 055d6f7..150b16a 100755
--- a/ansible/playbook.yml
+++ b/ansible/playbook.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: all
-  sudo: true
+  become: yes
   vars_files:
     - vars/all.yml
   roles:
diff --git a/ansible/roles/app/tasks/main.yml b/ansible/roles/app/tasks/main.yml
index c330e48..59e8b64 100755
--- a/ansible/roles/app/tasks/main.yml
+++ b/ansible/roles/app/tasks/main.yml
@@ -1,5 +1,4 @@
 ---
 # application tasks to be customized and to run after the main provision
 - name: update file db
-  sudo: yes
   shell: updatedb
diff --git a/ansible/roles/php/tasks/main.yml b/ansible/roles/php/tasks/main.yml
index 80fe97d..03fede2 100755
--- a/ansible/roles/php/tasks/main.yml
+++ b/ansible/roles/php/tasks/main.yml
@@ -1,30 +1,19 @@
 ---
 - name: Update apt
-  become: yes
   apt: update_cache=yes autoremove=yes
 
 - name: Add ppa Repository
-  sudo: yes
   apt_repository: repo=ppa:ondrej/{{ php.ppa }}
 
 - name: Update apt
-  sudo: yes
   apt: update_cache=yes
 
 - name: Install php7
-  sudo: yes
   apt: pkg=php7.0 state=latest
 
 - name: Install PHP Packages
-  sudo: yes
-  apt: pkg={{ item }} state=latest
-  with_items: '{{ php.packages }}'
+  apt: pkg="{{ item }}" state=latest
+  with_items: "{{ php.packages }}"
   when: php.packages is defined
 
-- name: Install PHP PECL Packages
-  become: yes
-  apt: pkg={{ item }} state=latest force=yes
-  with_items: '{{ php.pecl_packages }}'
-  when: php.pecl_packages is defined
-
 - include: configure.yml
diff --git a/ansible/roles/server/tasks/main.yml b/ansible/roles/server/tasks/main.yml
index f1ffc08..78efb9f 100755
--- a/ansible/roles/server/tasks/main.yml
+++ b/ansible/roles/server/tasks/main.yml
@@ -1,31 +1,25 @@
 ---
 - name: Update apt
-  sudo: yes
   apt: update_cache=yes
 
 - name: Install System Packages
-  sudo: yes
-  apt: pkg={{ item }} state=latest
+  apt: pkg="{{ item }}" state=latest
   with_items:
     - curl
     - wget
     - python-software-properties
 
 - name: Install Extra Packages
-  sudo: yes
-  apt: pkg={{ item }} state=latest
-  with_items: server.packages
+  apt: pkg="{{ item }}" state=latest
+  with_items: "{{ server.packages }}"
   when: server.packages is defined
 
 - name: Configure the timezone
-  sudo: yes
   template: src=timezone.tpl dest=/etc/timezone
 
 - name: More Configure the timezone
-  sudo: yes
   file: src=/usr/share/zoneinfo/{{server.timezone}} dest=/etc/localtime state=link force=yes backup=yes
 
 - name: Set default system language pack
   shell: locale-gen {{server.locale}}
-  sudo: yes
 
diff --git a/ansible/roles/xdebug/tasks/main.yml b/ansible/roles/xdebug/tasks/main.yml
index e38815d..380ee2b 100755
--- a/ansible/roles/xdebug/tasks/main.yml
+++ b/ansible/roles/xdebug/tasks/main.yml
@@ -1,4 +1,3 @@
 ---
 - name: Install xDebug
-  sudo: yes
   apt: pkg=php5-xdebug state=latest