Merge pull request #225 from mmoll/ansible2

Update playbook for recent ansible versions

ansible/baikal.yml

@@ -6,20 +6,20 @@
 
   - name: unzip baikal
     command: /usr/bin/unzip /tmp/baikal.zip -d /var/www
-    sudo: yes
+    become: yes
 
   - name: baikal permissions
     file: path=/var/www/baikal state=directory recurse=yes mode=0755 owner=www-data group=www-data
-    sudo: yes
+    become: yes
 
   - name: baikal configuration (1/2)
     copy: src=baikal/config.php dest=/var/www/baikal/Specific owner=www-data group=www-data mode=600 backup=yes
-    sudo: yes
+    become: yes
 
   - name: baikal configuration (2/2)
     copy: src=baikal/config.system.php dest=/var/www/baikal/Specific owner=www-data group=www-data mode=600 backup=yes
-    sudo: yes
+    become: yes
 
   - name: baikal database
     copy: src=baikal/db.sqlite dest=/var/www/baikal/Specific/db owner=www-data group=www-data mode=600 backup=yes
-    sudo: yes
+    become: yes

ansible/nodejs.yml

@@ -0,0 +1,23 @@
+---
+# NodeJS repository handling and installation
+
+  - name: Ensure apt-transport-https is installed.
+    apt: name=apt-transport-https state=present
+    become: yes
+
+  - name: Add Nodesource apt key.
+    apt_key:
+      url: https://keyserver.ubuntu.com/pks/lookup?op=get&fingerprint=on&search=0x1655A0AB68576280
+      id: "68576280"
+      state: present
+    become: yes
+
+  - name: Add NodeSource repositories for Node.js.
+    apt_repository:
+      repo: "deb https://deb.nodesource.com/node_6.x {{ ansible_distribution_release }} main"
+      state: present
+    become: yes
+
+  - name: Ensure Node.js is installed (The Nodesource package also contains npm)
+    apt: name=nodejs state=present
+    become: yes

ansible/playbook.yml

@@ -7,31 +7,29 @@
   tasks:
       - name: set system timezone
         template: src=system/timezone.j2 dest=/etc/timezone
-        sudo: yes
+        become: yes
 
       - name: reload timezone
-        sudo: yes
+        become: yes
         action: command /usr/sbin/dpkg-reconfigure -f noninteractive tzdata
 
       - name: install python-pycurl
-        sudo: yes
+        become: yes
         apt: name='python-pycurl' update_cache=yes
 
       - name: add ondrej/php repository
-        sudo: yes
+        become: yes
         apt_repository: repo='ppa:ondrej/php'
 
-      - name: add chris-lea/node.js repository
-        sudo: yes
-        apt_repository: repo='ppa:chris-lea/node.js'
+      - include: nodejs.yml
 
       - name: update apt cache
         apt: update_cache=yes
-        sudo: yes
+        become: yes
 
       - name: install packages
         apt: pkg={{ item }} state=latest
-        sudo: yes
+        become: yes
         with_items:
             - curl
             - git
@@ -64,45 +62,45 @@
 
       - name: configure php
         template: src=php/php.ini.j2 dest=/etc/php/7.1/apache2/php.ini owner=root mode=644 backup=yes
-        sudo: yes
+        become: yes
         notify: restart apache
 
       - name: enable mod_rewrite
         shell: /usr/sbin/a2enmod rewrite
-        sudo: yes
+        become: yes
         notify: restart apache
 
       - name: configure apache 1/3
         copy: src=apache/ports.conf dest=/etc/apache2/ports.conf owner=root mode=644 backup=yes
-        sudo: yes
+        become: yes
         notify: restart apache
 
       - name: configure apache 2/3
         copy: src=apache/agendav dest=/etc/apache2/sites-available/000-default.conf owner=root mode=644 backup=yes
-        sudo: yes
+        become: yes
         notify: restart apache
 
       - name: configure apache 3/3
         copy: src=apache/baikal dest=/etc/apache2/sites-available/baikal.conf owner=root mode=644 backup=yes
-        sudo: yes
+        become: yes
         notify: restart apache
 
       - name: enable baikal on apache
         shell: /usr/sbin/a2ensite baikal
-        sudo: yes
+        become: yes
         notify: restart apache
 
       - name: create agendav log directory
         file: path=/var/log/agendav state=directory owner=www-data group=vagrant mode=0774
-        sudo: yes
+        become: yes
 
       - name: create twig cache directory
         file: path=/var/cache/twig state=directory owner=www-data group=vagrant mode=0774
-        sudo: yes
+        become: yes
 
       - name: create vendors/ directory outside of shared folder
         file: path=/var/agendav-vendors state=directory owner=vagrant group=www-data mode=0775
-        sudo: yes
+        become: yes
 
       - name: check if composer is installed
         stat: path=/usr/local/bin/composer
@@ -111,23 +109,23 @@
       - name: install composer
         shell: /usr/bin/curl -sS https://getcomposer.org/installer | /usr/bin/php -- --install-dir=/usr/local/bin
         when: composer.stat.exists == false
-        sudo: yes
+        become: yes
 
       - name: rename composer.phar
         action: command /bin/mv /usr/local/bin/composer.phar /usr/local/bin/composer
         when: composer.stat.exists == false
-        sudo: yes
+        become: yes
 
       - name: Append the COMPOSER_VENDOR_DIR variable to bashrc
         lineinfile: dest=/home/vagrant/.bashrc line="export COMPOSER_VENDOR_DIR=/var/agendav-vendors"
 
       - name: change log permissions again
         file: path=/var/log/agendav recurse=true state=directory owner=www-data group=vagrant mode=0774
-        sudo: yes
+        become: yes
 
       - name: install bower
         npm: name=bower global=yes
-        sudo: yes
+        become: yes
 
       - name: install node dependencies for development
         npm: path=/vagrant state=latest
@@ -148,9 +146,9 @@
 
   handlers:
       - name: restart mysql
-        sudo: yes
+        become: yes
         action: service name=mysql state=restarted enabled=yes
 
       - name: restart apache
-        sudo: yes
+        become: yes
         action: service name=apache2 state=restarted enabled=yes