From 695801d26d0f0da959d0f006eb7f65d626a8dfbe Mon Sep 17 00:00:00 2001
From: Ivan Grynenko <ivan@salsadigital.com.au>
Date: Sat, 11 Jun 2016 10:31:11 +1000
Subject: [PATCH] Removed unused roles and update vars

---
 lemp-rhel7/group_vars/all                     |  4 +++-
 lemp-rhel7/roles/php-fpm/handlers/main.yml    |  3 ---
 lemp-rhel7/roles/php-fpm/tasks/main.yml       | 22 -------------------
 .../roles/php-fpm/templates/wordpress.conf    | 15 -------------
 lemp-rhel7/site.yml                           |  2 +-
 5 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 lemp-rhel7/roles/php-fpm/handlers/main.yml
 delete mode 100644 lemp-rhel7/roles/php-fpm/tasks/main.yml
 delete mode 100644 lemp-rhel7/roles/php-fpm/templates/wordpress.conf

diff --git a/lemp-rhel7/group_vars/all b/lemp-rhel7/group_vars/all
index e07589c..f9914ea 100644
--- a/lemp-rhel7/group_vars/all
+++ b/lemp-rhel7/group_vars/all
@@ -31,7 +31,9 @@ core_update_level: true
 php_enablerepo: "remi-php70"
 
 # PHP-FPM configuration.
-php_enable_php_fpm: fals
+php_enable_php_fpm: true
 
 php_apc_shm_size: "96M"
 php_date_timezone: "Australia/Melbourne"
+
+php_webserver_daemon: "nginx"
diff --git a/lemp-rhel7/roles/php-fpm/handlers/main.yml b/lemp-rhel7/roles/php-fpm/handlers/main.yml
deleted file mode 100644
index 6a975ad..0000000
--- a/lemp-rhel7/roles/php-fpm/handlers/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: restart php-fpm
-  service: name=php-fpm state=restarted
diff --git a/lemp-rhel7/roles/php-fpm/tasks/main.yml b/lemp-rhel7/roles/php-fpm/tasks/main.yml
deleted file mode 100644
index e9925ec..0000000
--- a/lemp-rhel7/roles/php-fpm/tasks/main.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- name: Install php-fpm and deps
-  yum: name={{ item }} state=present
-  with_items:
-    - php
-    - php-enchant
-    - php-IDNA_Convert
-    - php-mbstring
-    - php-mysql
-    - php-PHPMailer
-    - php-xml
-    - php-gd
-    - php-pecl-uploadprogress
-    - php-pecl-opcache
-
-- name: Disable default pool
-  command: mv /etc/php-fpm.d/www.conf /etc/php-fpm.d/www.disabled creates=/etc/php-fpm.d/www.disabled
-  notify: restart php-fpm
-
-- name: Copy php-fpm configuration
-  template: src=wordpress.conf dest=/etc/php-fpm.d/
-  notify: restart php-fpm
diff --git a/lemp-rhel7/roles/php-fpm/templates/wordpress.conf b/lemp-rhel7/roles/php-fpm/templates/wordpress.conf
deleted file mode 100644
index 10434c5..0000000
--- a/lemp-rhel7/roles/php-fpm/templates/wordpress.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[wordpress]
-listen = /var/run/php-fpm/wordpress.sock
-listen.owner = nginx
-listen.group = nginx
-listen.mode = 0660
-user = wordpress
-group = wordpress
-pm = dynamic
-pm.max_children = 10
-pm.start_servers = 1
-pm.min_spare_servers = 1
-pm.max_spare_servers = 3
-pm.max_requests = 500
-chdir = /srv/wordpress/
-php_admin_value[open_basedir] = /srv/wordpress/:/tmp
diff --git a/lemp-rhel7/site.yml b/lemp-rhel7/site.yml
index 826ceb6..e6c5f81 100644
--- a/lemp-rhel7/site.yml
+++ b/lemp-rhel7/site.yml
@@ -1,5 +1,5 @@
 ---
-- name: Install WordPress, MariaDB, Nginx, and PHP-FPM
+- name: MariaDB, Nginx, and PHP-FPM
   hosts: lemp-server
   remote_user: root
   # remote_user: user