Move WP php-fpm confs into wordpress-sites role

roots · May 2, 2014 · e934c02 · e934c02
1 parent 6e82758
commit e934c02
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/roles/php-55/tasks/main.yml b/roles/php-55/tasks/main.yml
@@ -28,7 +28,3 @@
   when: disable_default_pool
   notify: restart php-fpm
 
-- name: Copy php-fpm configuration
-  template: src=wordpress.conf.j2 dest=/etc/php5/fpm/pool.d/{{ item.site_name }}.conf
-  with_items: wordpress_sites
-  notify: restart php-fpm
diff --git a/roles/wordpress-sites/tasks/nginx.yml b/roles/wordpress-sites/tasks/nginx.yml
@@ -10,3 +10,7 @@
         state=link
   with_items: wordpress_sites
 
+- name: Copy php-fpm configuration
+  template: src=php-fpm.conf.j2 dest=/etc/php5/fpm/pool.d/{{ item.site_name }}.conf
+  with_items: wordpress_sites
+  notify: restart php-fpm
diff --git a/roles/php-55/templates/wordpress.conf.j2 → ...wordpress-sites/templates/php-fpm.conf.j2 b/roles/php-55/templates/wordpress.conf.j2 → ...wordpress-sites/templates/php-fpm.conf.j2