From 531dff8a882ef91dd1c5e7289cecf20be8be2158 Mon Sep 17 00:00:00 2001 From: Antonin Januska Date: Wed, 19 Mar 2014 14:08:47 -0500 Subject: [PATCH 1/2] Legacy variable substitiont --- provisioning/roles/common/tasks/main.yml | 12 ++++++------ provisioning/roles/varnish/tasks/main.yml | 4 ++-- provisioning/roles/wordpress/tasks/main.yml | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/provisioning/roles/common/tasks/main.yml b/provisioning/roles/common/tasks/main.yml index f5eb80e..2d60798 100644 --- a/provisioning/roles/common/tasks/main.yml +++ b/provisioning/roles/common/tasks/main.yml @@ -30,8 +30,8 @@ sudo: yes - name: Install system packages - apt: pkg=${item} - with_items: ${system_packages} + apt: pkg={{item}} + with_items: {{system_packages}} sudo: yes - name: Install bower @@ -43,13 +43,13 @@ sudo: yes - name: Install PHP packages - apt: pkg=${item} - with_items: ${php_packages} + apt: pkg={{item}} + with_items: {{php_packages}} sudo: yes - name: Enable Apache modules - command: a2enmod ${item} - with_items: ${apache_modules} + command: a2enmod {{item}} + with_items: {{apache_modules}} sudo: yes - name: Check for vagrant user diff --git a/provisioning/roles/varnish/tasks/main.yml b/provisioning/roles/varnish/tasks/main.yml index 86136e8..898bb47 100644 --- a/provisioning/roles/varnish/tasks/main.yml +++ b/provisioning/roles/varnish/tasks/main.yml @@ -16,7 +16,7 @@ sudo: yes - name: Create Varnish directory structure - file: path=${item} state=directory mode=0644 + file: path={{item}} state=directory mode=0644 sudo: yes with_items: - /etc/varnish @@ -25,7 +25,7 @@ - /etc/varnish/conf.d/receive - name: Copy Varnish configuration files - copy: src=etc-varnish/${item} dest=/etc/varnish/${item} mode=0644 + copy: src=etc-varnish/{{item}} dest=/etc/varnish/{{item}} mode=0644 sudo: yes with_items: - conf.d/fetch/wordpress.vcl diff --git a/provisioning/roles/wordpress/tasks/main.yml b/provisioning/roles/wordpress/tasks/main.yml index d70b8cd..759f4d8 100644 --- a/provisioning/roles/wordpress/tasks/main.yml +++ b/provisioning/roles/wordpress/tasks/main.yml @@ -4,22 +4,22 @@ sudo: yes - name: Create MySQL database - mysql_db: name=${mysql.name} + mysql_db: name={{mysql.name}} - name: Create MySQL user - mysql_user: name=${mysql.user} host=${mysql.host} password=${mysql.password} priv=${mysql.name}.*:GRANT,ALL + mysql_user: name={{mysql.user}} host={{mysql.host}} password={{mysql.password}} priv={{mysql.name}}.*:GRANT,ALL - name: Disable default apache site command: a2dissite 000-default removes=/etc/apache2/sites-enabled/000-default - name: Create apache vhosts - template: src=vhosts/${item} dest=/etc/apache2/sites-available/${item}.${domain} mode=0644 - with_items: ${apache_vhosts} + template: src=vhosts/{{item}} dest=/etc/apache2/sites-available/{{item}}.{{domain}} mode=0644 + with_items: {{apache_vhosts}} sudo: true - name: Enable apache vhosts - command: a2ensite ${item}.${domain} - with_items: ${apache_vhosts} + command: a2ensite {{item}}.{{domain}} + with_items: {{apache_vhosts}} sudo: true notify: - restart apache From 4e31cff95386458a0c95c3c162880a14416a1832 Mon Sep 17 00:00:00 2001 From: Antonin Januska Date: Wed, 19 Mar 2014 14:35:15 -0500 Subject: [PATCH 2/2] Correcting unnecessary braces error --- provisioning/roles/common/tasks/main.yml | 6 +++--- provisioning/roles/wordpress/tasks/main.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/provisioning/roles/common/tasks/main.yml b/provisioning/roles/common/tasks/main.yml index 2d60798..0427dd1 100644 --- a/provisioning/roles/common/tasks/main.yml +++ b/provisioning/roles/common/tasks/main.yml @@ -31,7 +31,7 @@ - name: Install system packages apt: pkg={{item}} - with_items: {{system_packages}} + with_items: system_packages sudo: yes - name: Install bower @@ -44,12 +44,12 @@ - name: Install PHP packages apt: pkg={{item}} - with_items: {{php_packages}} + with_items: php_packages sudo: yes - name: Enable Apache modules command: a2enmod {{item}} - with_items: {{apache_modules}} + with_items: apache_modules sudo: yes - name: Check for vagrant user diff --git a/provisioning/roles/wordpress/tasks/main.yml b/provisioning/roles/wordpress/tasks/main.yml index 759f4d8..de08724 100644 --- a/provisioning/roles/wordpress/tasks/main.yml +++ b/provisioning/roles/wordpress/tasks/main.yml @@ -14,12 +14,12 @@ - name: Create apache vhosts template: src=vhosts/{{item}} dest=/etc/apache2/sites-available/{{item}}.{{domain}} mode=0644 - with_items: {{apache_vhosts}} + with_items: apache_vhosts sudo: true - name: Enable apache vhosts command: a2ensite {{item}}.{{domain}} - with_items: {{apache_vhosts}} + with_items: apache_vhosts sudo: true notify: - restart apache