From ad2bc80ebefe686865164750e51d6573840c8ec7 Mon Sep 17 00:00:00 2001 From: Ivan Grynenko Date: Sun, 12 Jun 2016 13:53:40 +1000 Subject: [PATCH] Added vmuser user and updated vars for nginx vhost directory. --- lemp-rhel7/group_vars/all.yml | 2 +- lemp-rhel7/roles/ansible-role-nginx/tasks/vhosts.yml | 2 +- lemp-rhel7/roles/common/tasks/main.yml | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lemp-rhel7/group_vars/all.yml b/lemp-rhel7/group_vars/all.yml index 4fcdab0..7c4fc10 100644 --- a/lemp-rhel7/group_vars/all.yml +++ b/lemp-rhel7/group_vars/all.yml @@ -57,7 +57,7 @@ php_enablerepo: "remi-php70" # PHP-FPM configuration. php_enable_php_fpm: true -php_fpm_pool_user: nginx +php_fpm_pool_user: vmuser php_fpm_pool_group: nginx php_apc_shm_size: "128M" diff --git a/lemp-rhel7/roles/ansible-role-nginx/tasks/vhosts.yml b/lemp-rhel7/roles/ansible-role-nginx/tasks/vhosts.yml index 560b455..6af3173 100755 --- a/lemp-rhel7/roles/ansible-role-nginx/tasks/vhosts.yml +++ b/lemp-rhel7/roles/ansible-role-nginx/tasks/vhosts.yml @@ -17,7 +17,7 @@ - reload nginx - name: Creates Nginx vhost directory - file: path=/var/www/html/{{ server_hostname }} state=directory owner={{ nginx_user }} group={{ nginx_user }} mode=0775 recurse=yes + file: path=/var/www/html/{{ server_hostname }} state=directory owner={{ php_fpm_pool_user }} group={{ php_fpm_pool_group }} mode=0755 recurse=yes when: nginx_vhosts|length > 0 notify: - reload nginx diff --git a/lemp-rhel7/roles/common/tasks/main.yml b/lemp-rhel7/roles/common/tasks/main.yml index 6c5f9d3..36ca3a2 100644 --- a/lemp-rhel7/roles/common/tasks/main.yml +++ b/lemp-rhel7/roles/common/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Copy the NGINX repository definition copy: src=nginx.repo dest=/etc/yum.repos.d/ - + - name: Copy the EPEL repository definition copy: src=epel.repo dest=/etc/yum.repos.d/ @@ -9,4 +9,7 @@ copy: src=RPM-GPG-KEY-NGINX dest=/etc/pki/rpm-gpg - name: Create the GPG key for EPEL - copy: src=RPM-GPG-KEY-EPEL-7 dest=/etc/pki/rpm-gpg \ No newline at end of file + copy: src=RPM-GPG-KEY-EPEL-7 dest=/etc/pki/rpm-gpg + +- name: Creates vmuser user + user: name=vmuser comment=DefaultUser groups=vmuser,wheel shell=/bin/bash createhome=yes