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 #1256 from holta/fix-apache-conf-perms

Browse source 
Fix Apache .conf & systemd unit files perms / ownership
This commit is contained in:
A Holt 2018-10-27 21:28:42 -04:00 • committed by GitHub
commit ae19b50f16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/calibre-web/tasks/main.yml
View file

@ -43,13 +43,13 @@
src: "{{ calibreweb_venv_path }}/lib/python2.7/site-packages" src: "{{ calibreweb_venv_path }}/lib/python2.7/site-packages"
dest: "{{ calibreweb_venv_path }}/vendor" dest: "{{ calibreweb_venv_path }}/vendor"
- name: Create Calibre-Web systemd service unit file and calibre-web.conf for Apache - name: Install systemd unit file calibre-web.service & Apache's calibre-web.conf, from templates
template: template:
src: "{{ item.src }}" src: "{{ item.src }}"
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
mode: "{{ item.mode }}" mode: "{{ item.mode }}"
owner: "{{ calibreweb_user }}" owner: root
group: "{{ apache_user }}" group: root
with_items: with_items:
- { src: 'calibre-web.service.j2', dest: '/etc/systemd/system/calibre-web.service', mode: '0644' } - { src: 'calibre-web.service.j2', dest: '/etc/systemd/system/calibre-web.service', mode: '0644' }
- { src: 'calibre-web.conf.j2', dest: '/etc/apache2/sites-available/calibre-web.conf', mode: '0644' } - { src: 'calibre-web.conf.j2', dest: '/etc/apache2/sites-available/calibre-web.conf', mode: '0644' }

16
roles/httpd/tasks/main.yml
View file

@ -1,4 +1,4 @@
- name: Install httpd required packages (debian) - name: Install Apache's required packages (debian)
package: package:
name: "{{ item }}" name: "{{ item }}"
state: present state: present
@ -21,7 +21,7 @@
name: "php{{ php_version }}-sqlite3" name: "php{{ php_version }}-sqlite3"
when: is_debian and ansible_distribution_major_version == "9" when: is_debian and ansible_distribution_major_version == "9"
- name: Install httpd required packages (ubuntu) - name: Install Apache's required packages (ubuntu)
package: package:
name: "{{ item }}" name: "{{ item }}"
state: present state: present
@ -37,7 +37,7 @@
name: php{{ php_version }}-sqlite3 name: php{{ php_version }}-sqlite3
when: is_ubuntu_18 when: is_ubuntu_18
- name: Install httpd required packages (redhat) - name: Install Apache's required packages (redhat)
package: package:
name: "{{ item }}" name: "{{ item }}"
state: present state: present
@ -58,7 +58,7 @@
# state: absent # state: absent
# when: is_debuntu # when: is_debuntu
- name: Create httpd config files - name: Install Apache's 010-iiab.conf & proxy_ajp.conf into /etc/apache2/sites-available, from templates
template: template:
backup: yes backup: yes
src: "{{ item.src }}" src: "{{ item.src }}"
@ -67,7 +67,7 @@
group: root group: root
mode: "{{ item.mode }}" mode: "{{ item.mode }}"
with_items: with_items:
- { src: '010-iiab.conf.j2', dest: '/etc/{{ apache_config_dir }}/010-iiab.conf', mode: '0755' } - { src: '010-iiab.conf.j2', dest: '/etc/{{ apache_config_dir }}/010-iiab.conf', mode: '0644' }
- { src: 'proxy_ajp.conf.j2', dest: '/etc/{{ apache_config_dir }}/proxy_ajp.conf', mode: '0644' } - { src: 'proxy_ajp.conf.j2', dest: '/etc/{{ apache_config_dir }}/proxy_ajp.conf', mode: '0644' }
#- { src: 'php.ini.j2', dest: '/etc/php.ini', mode: '0644' } # @jvonau suggests removing this in https://github.com/iiab/iiab/issues/1147 #- { src: 'php.ini.j2', dest: '/etc/php.ini', mode: '0644' } # @jvonau suggests removing this in https://github.com/iiab/iiab/issues/1147
@ -133,7 +133,7 @@
- /etc/apache2/sites-enabled/000-default.conf - /etc/apache2/sites-enabled/000-default.conf
when: is_debuntu when: is_debuntu
- name: Create http pid dir /var/run/{{ apache_user }} - name: Create Apache's pid dir /var/run/{{ apache_user }}
file: file:
path: "/var/run/{{ apache_user }}" path: "/var/run/{{ apache_user }}"
mode: 0755 mode: 0755
@ -153,7 +153,7 @@
state: present state: present
createhome: no createhome: no
- name: Create httpd log dir /var/log/{{ apache_service }} - name: Create Apache's log dir /var/log/{{ apache_service }}
file: file:
path: "/var/log/{{ apache_service }}" path: "/var/log/{{ apache_service }}"
mode: 0755 mode: 0755
@ -161,7 +161,7 @@
group: "{{ apache_user }}" group: "{{ apache_user }}"
state: directory state: directory
- name: Enable httpd - name: Enable systemd service {{ apache_service }}
service: service:
name: "{{ apache_service }}" name: "{{ apache_service }}"
enabled: yes enabled: yes

2
roles/network/tasks/captive_portal.yml
View file

@ -56,7 +56,7 @@
dest: /etc/{{ apache_config_dir }}/captive-portal.conf dest: /etc/{{ apache_config_dir }}/captive-portal.conf
owner: root owner: root
group: root group: root
mode: 0740 mode: 0644
when: py_captive_portal_enabled when: py_captive_portal_enabled
- name: Enable Apache's captive-portal.conf if py_captive_portal_enabled (debuntu) - name: Enable Apache's captive-portal.conf if py_captive_portal_enabled (debuntu)