feat: no create usr in the role
This commit is contained in:
parent
b3fd17bdf8
commit
1735ff1ffd
4 changed files with 6 additions and 28 deletions
|
@ -1,22 +1,3 @@
|
||||||
- name: create user for php-fpm with a specify uid
|
|
||||||
user:
|
|
||||||
name: '{{ item.user }}'
|
|
||||||
group: '{{ item.group|default(phpfpm_group) }}'
|
|
||||||
uid: '{{ item.uid }}'
|
|
||||||
home: '{{ item.home }}'
|
|
||||||
with_items: '{{ phpfpm_pools }}'
|
|
||||||
when: item.uid is defined
|
|
||||||
tags: phpfpm
|
|
||||||
|
|
||||||
- name: create user for php-fpm without a specify uid
|
|
||||||
user:
|
|
||||||
name: '{{ item.user }}'
|
|
||||||
group: '{{ item.group|default(phpfpm_group) }}'
|
|
||||||
home: '{{ item.home }}'
|
|
||||||
with_items: '{{ phpfpm_pools }}'
|
|
||||||
when: not item.uid is defined
|
|
||||||
tags: phpfpm
|
|
||||||
|
|
||||||
- name: set attributes on homes directories
|
- name: set attributes on homes directories
|
||||||
file:
|
file:
|
||||||
path: '{{ item.home }}'
|
path: '{{ item.home }}'
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
[{{ pool.name }}]
|
[{{ pool.name }}]
|
||||||
|
|
||||||
user = {{ pool.user }}
|
user = {{ pool.user }}
|
||||||
group = {{ pool.group|default(phpfpm_group) }}
|
group = users
|
||||||
|
|
||||||
listen = /var/run/php{{ phpfpm_version }}-fpm-{{ pool.name }}.sock
|
listen = /var/run/php{{ phpfpm_version }}-fpm-{{ pool.name }}.sock
|
||||||
listen.owner = {{ pool.user }}
|
listen.owner = {{ pool.user }}
|
||||||
|
|
|
@ -5,12 +5,15 @@
|
||||||
- name: website1
|
- name: website1
|
||||||
user: www
|
user: www
|
||||||
home: /opt/www
|
home: /opt/www
|
||||||
uid: 1001
|
|
||||||
- name: website2
|
- name: website2
|
||||||
user: website2
|
user: www
|
||||||
home: /opt/website2
|
home: /opt/website2
|
||||||
pm: static
|
pm: static
|
||||||
pm_max_children: 4
|
pm_max_children: 4
|
||||||
|
|
||||||
|
pre_tasks:
|
||||||
|
- user:
|
||||||
|
name: www
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- ansible-role-phpfpm
|
- ansible-role-phpfpm
|
||||||
|
|
|
@ -19,12 +19,6 @@ puts '================================'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe user('www') do
|
|
||||||
it { should exist }
|
|
||||||
it { should have_uid 1001 }
|
|
||||||
it { should belong_to_group 'www-data' }
|
|
||||||
end
|
|
||||||
|
|
||||||
describe file('/etc/logrotate.d/php7.0-fpm') do
|
describe file('/etc/logrotate.d/php7.0-fpm') do
|
||||||
it { should be_file }
|
it { should be_file }
|
||||||
it { should be_mode 644 }
|
it { should be_mode 644 }
|
||||||
|
|
Loading…
Reference in a new issue