external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #405 from iiab/release-7.1

Browse source 
sync from iiab:release-7.1
This commit is contained in:
A Holt 2020-06-06 10:25:36 -04:00 • committed by GitHub
commit 57d5014693
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
roles/httpd/tasks/install.yml
View file

@ -3,7 +3,7 @@
#name: [u'apache2', u'php{{ php_version }}', u'php{{ php_version }}-curl'] # FAILS ('u' for Unicode strings) #name: [u'apache2', u'php{{ php_version }}', u'php{{ php_version }}-curl'] # FAILS ('u' for Unicode strings)
#name: ['apache2', 'php{{ php_version }}', 'php{{ php_version }}-curl'] # WORKS? #name: ['apache2', 'php{{ php_version }}', 'php{{ php_version }}-curl'] # WORKS?
name: name:
- apache2 - "{{ apache_service }}" # apache2 on Debuntu
- "php{{ php_version }}" - "php{{ php_version }}"
- "php{{ php_version }}-curl" - "php{{ php_version }}-curl"
state: present state: present
@ -14,7 +14,7 @@
#name: [u'apache2', u'php'] # FAILS ('u' for Unicode strings) #name: [u'apache2', u'php'] # FAILS ('u' for Unicode strings)
#name: ['apache2', 'php'] # WORKS #name: ['apache2', 'php'] # WORKS
name: name:
- apache2 - "{{ apache_service }}" # apache2 on Debuntu
- php - php
state: present state: present
when: is_ubuntu | bool when: is_ubuntu | bool
@ -92,7 +92,7 @@
- name: Create Apache's pid dir /var/run/{{ apache_user }} - name: Create Apache's pid dir /var/run/{{ apache_user }}
file: file:
state: directory state: directory
path: "/var/run/{{ apache_user }}" path: "/var/run/{{ apache_user }}" # www-data on Debuntu
#owner: root #owner: root
#group: root #group: root
#mode: '0755' #mode: '0755'
@ -100,20 +100,18 @@
- name: 'Create group: admin' - name: 'Create group: admin'
group: group:
name: admin name: admin
state: present
- name: Add user {{ apache_user }} (from variable apache_user) to group admin - name: Add user {{ apache_user }} (from variable apache_user) to groups admin,shadow
user: user:
name: "{{ apache_user }}" name: "{{ apache_user }}" # www-data on Debuntu
groups: admin groups: admin,shadow # 2020-06-04: shadow nec for Admin Console login (this line had been clobbering user www-data's membership in group shadow, as set earlier by nginx/tasks/install.yml, SEE #2431)
state: present
createhome: no createhome: no
- name: Create Apache dir /var/log/{{ apache_service }} ({{ apache_user }}:{{ apache_user }}) - name: Create Apache dir /var/log/{{ apache_service }} ({{ apache_user }}:{{ apache_user }})
file: file:
state: directory state: directory
path: "/var/log/{{ apache_service }}" path: "/var/log/{{ apache_service }}" # apache2 on Debuntu
owner: "{{ apache_user }}" owner: "{{ apache_user }}" # www-data on Debuntu
group: "{{ apache_user }}" group: "{{ apache_user }}"
#mode: '0755' #mode: '0755'