Added yml clear marker

mblaschke · mblaschke · commit 3d2df4e19928 · 2015-10-15T22:21:20.000+02:00
diff --git a/docker/main/provision/roles/composer/tasks/install.yml b/docker/main/provision/roles/composer/tasks/install.yml
@@ -1,2 +1,4 @@
+---
+
 - name: Install composer (phar)
   raw: 'curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer'
diff --git a/docker/main/provision/roles/composer/tasks/main.yml b/docker/main/provision/roles/composer/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - include: install.yml
   tags:
     - bootstrap
diff --git a/docker/main/provision/roles/cron/tasks/configuration.yml b/docker/main/provision/roles/cron/tasks/configuration.yml
@@ -1,2 +1,4 @@
+---
+
 - name: Add newline to crontab
   raw: 'echo >> /opt/docker/etc/crontab'
diff --git a/docker/main/provision/roles/cron/tasks/install.yml b/docker/main/provision/roles/cron/tasks/install.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Install cron
   apt:
     name:  '{{ item }}'
@@ -20,4 +22,4 @@
     src:  '/opt/docker/conf/crontab'
     dest: '/etc/cron.d/docker-boilerplate'
     state: link
-    force: yes
+    force: yes
diff --git a/docker/main/provision/roles/cron/tasks/main.yml b/docker/main/provision/roles/cron/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - include: install.yml
   tags:
     - bootstrap
diff --git a/docker/main/provision/roles/dnsmasqd/tasks/install.yml b/docker/main/provision/roles/dnsmasqd/tasks/install.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Install dnsmasqd
   apt:
     name:  '{{ item }}'
diff --git a/docker/main/provision/roles/dnsmasqd/tasks/main.yml b/docker/main/provision/roles/dnsmasqd/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - include: install.yml
   tags:
     - bootstrap
diff --git a/docker/main/provision/roles/finalize/tasks/cleanup.yml b/docker/main/provision/roles/finalize/tasks/cleanup.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Cleanup apt
   command: apt-get clean -y
   when: ansible_distribution == 'Ubuntu'
diff --git a/docker/main/provision/roles/finalize/tasks/main.yml b/docker/main/provision/roles/finalize/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - include: cleanup.yml
   tags:
     - bootstrap
diff --git a/docker/main/provision/roles/hhvm/tasks/configuration.yml b/docker/main/provision/roles/hhvm/tasks/configuration.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/main/provision/roles/hhvm/tasks/install.yml b/docker/main/provision/roles/hhvm/tasks/install.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Install hhvm gpg key
   apt_key:
     url: http://dl.hhvm.com/conf/hhvm.gpg.key
@@ -27,4 +29,4 @@
     src:   '{{ current_hhvm.stdout }}'
     dest:  /usr/bin/php
     state: link
-    force: yes
+    force: yes
diff --git a/docker/main/provision/roles/hhvm/tasks/main.yml b/docker/main/provision/roles/hhvm/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - include: install.yml
   tags:
     - bootstrap
diff --git a/docker/main/provision/roles/init/tasks/main.yml b/docker/main/provision/roles/init/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Update package cache (apt-get update) ... will take some time
   apt: update_cache=yes
   when: ansible_distribution == 'Ubuntu'
diff --git a/docker/main/provision/roles/locales/tasks/generate.yml b/docker/main/provision/roles/locales/tasks/generate.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Copy defined locales
   raw: 'cat /opt/docker/locale.conf >> /var/lib/locales/supported.d/local'
 
diff --git a/docker/main/provision/roles/locales/tasks/main.yml b/docker/main/provision/roles/locales/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - include: generate.yml
   when: ansible_distribution == 'Ubuntu'
   tags:
diff --git a/docker/main/provision/roles/mysql/tasks/configuration.yml b/docker/main/provision/roles/mysql/tasks/configuration.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Deploy root my.cnf
   template:
     src:   my.cnf.j2
diff --git a/docker/main/provision/roles/mysql/tasks/install.yml b/docker/main/provision/roles/mysql/tasks/install.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Install mysql client
   apt:
     name:  '{{ item }}'
diff --git a/docker/main/provision/roles/mysql/tasks/main.yml b/docker/main/provision/roles/mysql/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - include: install.yml
   tags:
     - bootstrap
diff --git a/docker/main/provision/roles/packages/tasks/main.yml b/docker/main/provision/roles/packages/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - include: packages-centos.yml
   when: ansible_distribution == 'CentOS'
   tags:
diff --git a/docker/main/provision/roles/packages/tasks/packages-centos.yml b/docker/main/provision/roles/packages/tasks/packages-centos.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Install packages (system tools)
   yum:
     name:  '{{ item }}'
diff --git a/docker/main/provision/roles/packages/tasks/packages-ubuntu.yml b/docker/main/provision/roles/packages/tasks/packages-ubuntu.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Install packages (system tools)
   apt:
     name:  '{{ item }}'
diff --git a/docker/main/provision/roles/php/tasks/centos/blackfire.yml b/docker/main/provision/roles/php/tasks/centos/blackfire.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Add blackfire.io key
   rpm_key:
     key:   https://packagecloud.io/gpg.key
diff --git a/docker/main/provision/roles/php/tasks/centos/configuration.yml b/docker/main/provision/roles/php/tasks/centos/configuration.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Configure php-fpm (pool www.conf)
   lineinfile:
     dest:   /etc/php-fpm.d/www.conf
diff --git a/docker/main/provision/roles/php/tasks/centos/install.yml b/docker/main/provision/roles/php/tasks/centos/install.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Install php
   yum:
     name:  '{{ item }}'
diff --git a/docker/main/provision/roles/php/tasks/centos/modules.yml b/docker/main/provision/roles/php/tasks/centos/modules.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Disable XDebug
   file:
     path: "{{ item }}"
diff --git a/docker/main/provision/roles/php/tasks/main.yml b/docker/main/provision/roles/php/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 #############################
 # Ubuntu
 #############################
diff --git a/docker/main/provision/roles/php/tasks/ubuntu/blackfire.yml b/docker/main/provision/roles/php/tasks/ubuntu/blackfire.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Add blackfire.io key
   apt_key:
     url:   https://packagecloud.io/gpg.key
diff --git a/docker/main/provision/roles/php/tasks/ubuntu/configuration.yml b/docker/main/provision/roles/php/tasks/ubuntu/configuration.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Configure php-fpm (pool www.conf)
   lineinfile:
     dest:   /etc/php5/fpm/pool.d/www.conf
diff --git a/docker/main/provision/roles/php/tasks/ubuntu/install.yml b/docker/main/provision/roles/php/tasks/ubuntu/install.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Install php
   apt:
     name:  '{{ item }}'
diff --git a/docker/main/provision/roles/php/tasks/ubuntu/modules.yml b/docker/main/provision/roles/php/tasks/ubuntu/modules.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Disable XDebug
   file:
     path: "{{ item }}"
diff --git a/docker/main/provision/roles/ssmtp/tasks/configuration.yml b/docker/main/provision/roles/ssmtp/tasks/configuration.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Setup ssmtp
   lineinfile:
     dest:   /etc/ssmtp/ssmtp.conf
diff --git a/docker/main/provision/roles/ssmtp/tasks/install.yml b/docker/main/provision/roles/ssmtp/tasks/install.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Install ssmtp
   apt:
     name:  '{{ item }}'
diff --git a/docker/main/provision/roles/ssmtp/tasks/main.yml b/docker/main/provision/roles/ssmtp/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - include: install.yml
   tags:
     - bootstrap
diff --git a/docker/main/provision/roles/supervisord/tasks/install.yml b/docker/main/provision/roles/supervisord/tasks/install.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Install supervisor
   apt:
     name:  '{{ item }}'
diff --git a/docker/main/provision/roles/supervisord/tasks/main.yml b/docker/main/provision/roles/supervisord/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - include: install.yml
   tags:
     - bootstrap
diff --git a/docker/main/provision/roles/update/tasks/main.yml b/docker/main/provision/roles/update/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - include: update-centos.yml
   when: ansible_distribution == 'CentOS'
   tags:
diff --git a/docker/main/provision/roles/update/tasks/update-centos.yml b/docker/main/provision/roles/update/tasks/update-centos.yml
@@ -1,2 +1,4 @@
+---
+
 - name: Update distribution packages (yum) ... will take some time
   yum: name=* state=latest
diff --git a/docker/main/provision/roles/update/tasks/update-ubuntu.yml b/docker/main/provision/roles/update/tasks/update-ubuntu.yml
@@ -1,2 +1,4 @@
+---
+
 - name: Upgrade distribution packages (apt-get dist-upgrade) ... will take some time
   apt: upgrade=dist
diff --git a/docker/main/provision/roles/users/tasks/home-ssh.yml b/docker/main/provision/roles/users/tasks/home-ssh.yml
@@ -1,3 +1,5 @@
+---
+
 # create a directory if it doesn't exist
 - name: Create /home/.ssh/
   file:
diff --git a/docker/main/provision/roles/users/tasks/main.yml b/docker/main/provision/roles/users/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - include: user.yml
   tags:
     - entrypoint
diff --git a/docker/main/provision/roles/users/tasks/user.yml b/docker/main/provision/roles/users/tasks/user.yml
@@ -1,3 +1,5 @@
+---
+
 - group:
     name:  "{{ DOCKER.CLI_USER }}"
     gid:   "{{ DOCKER.EFFECTIVE_UID }}"

-Original file line number
+Diff line change
@@ @@ -1,2 +1,4 @@ @@
 +---
++
 - name: Install composer (phar)
   raw: 'curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer'
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+---`
	`2`	`+`
`1`	`3`	`- include: install.yml`
`2`	`4`	`tags:`
`3`	`5`	`- bootstrap`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+---`
	`2`	`+`
`1`	`3`	`- name: Install dnsmasqd`
`2`	`4`	`apt:`
`3`	`5`	`name: '{{ item }}'`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+---`
	`2`	`+`
`1`	`3`	`- name: Cleanup apt`
`2`	`4`	`command: apt-get clean -y`
`3`	`5`	`when: ansible_distribution == 'Ubuntu'`