From c6cf479d82f4a0eec599c20b79c2f0d3215e0bd1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 27 Oct 2018 20:48:21 -0400 Subject: [PATCH 1/6] Update main.yml --- roles/calibre-web/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/calibre-web/tasks/main.yml b/roles/calibre-web/tasks/main.yml index 0347aef79..dacaeb72f 100644 --- a/roles/calibre-web/tasks/main.yml +++ b/roles/calibre-web/tasks/main.yml @@ -48,8 +48,8 @@ src: "{{ item.src }}" dest: "{{ item.dest }}" mode: "{{ item.mode }}" - owner: "{{ calibreweb_user }}" - group: "{{ apache_user }}" + owner: root + group: root with_items: - { 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' } From 8b7ee46e2692cbd02bb6290fb48a875e5d017ad9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 27 Oct 2018 20:53:44 -0400 Subject: [PATCH 2/6] Update main.yml --- roles/httpd/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index 91698ae62..e94509c27 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -67,7 +67,7 @@ group: root mode: "{{ item.mode }}" 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: 'php.ini.j2', dest: '/etc/php.ini', mode: '0644' } # @jvonau suggests removing this in https://github.com/iiab/iiab/issues/1147 From d37c0acc881160170a50839bd231cd8fd7f05427 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 27 Oct 2018 20:54:44 -0400 Subject: [PATCH 3/6] Update captive_portal.yml --- roles/network/tasks/captive_portal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/captive_portal.yml b/roles/network/tasks/captive_portal.yml index 1474a7f0d..7e9114185 100644 --- a/roles/network/tasks/captive_portal.yml +++ b/roles/network/tasks/captive_portal.yml @@ -56,7 +56,7 @@ dest: /etc/{{ apache_config_dir }}/captive-portal.conf owner: root group: root - mode: 0740 + mode: 0644 when: py_captive_portal_enabled - name: Enable Apache's captive-portal.conf if py_captive_portal_enabled (debuntu) From dd281ba745cac00b9ab60a517bbd74c4b26169cd Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 27 Oct 2018 21:06:27 -0400 Subject: [PATCH 4/6] Update main.yml --- roles/httpd/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index e94509c27..5b7c25173 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -58,7 +58,7 @@ # state: absent # 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: backup: yes src: "{{ item.src }}" From 2822048ea2bba1d51aaf8b042482a0a5a9849835 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 27 Oct 2018 21:06:30 -0400 Subject: [PATCH 5/6] Update main.yml --- roles/calibre-web/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre-web/tasks/main.yml b/roles/calibre-web/tasks/main.yml index dacaeb72f..c4013ca6e 100644 --- a/roles/calibre-web/tasks/main.yml +++ b/roles/calibre-web/tasks/main.yml @@ -43,7 +43,7 @@ src: "{{ calibreweb_venv_path }}/lib/python2.7/site-packages" 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: src: "{{ item.src }}" dest: "{{ item.dest }}" From 9c464197b9f9b2f92c92b07ff2aa670890e19991 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 27 Oct 2018 21:13:29 -0400 Subject: [PATCH 6/6] Update main.yml --- roles/httpd/tasks/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index 5b7c25173..0b887683c 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -1,4 +1,4 @@ -- name: Install httpd required packages (debian) +- name: Install Apache's required packages (debian) package: name: "{{ item }}" state: present @@ -21,7 +21,7 @@ name: "php{{ php_version }}-sqlite3" when: is_debian and ansible_distribution_major_version == "9" -- name: Install httpd required packages (ubuntu) +- name: Install Apache's required packages (ubuntu) package: name: "{{ item }}" state: present @@ -37,7 +37,7 @@ name: php{{ php_version }}-sqlite3 when: is_ubuntu_18 -- name: Install httpd required packages (redhat) +- name: Install Apache's required packages (redhat) package: name: "{{ item }}" state: present @@ -133,7 +133,7 @@ - /etc/apache2/sites-enabled/000-default.conf when: is_debuntu -- name: Create http pid dir /var/run/{{ apache_user }} +- name: Create Apache's pid dir /var/run/{{ apache_user }} file: path: "/var/run/{{ apache_user }}" mode: 0755 @@ -153,7 +153,7 @@ state: present createhome: no -- name: Create httpd log dir /var/log/{{ apache_service }} +- name: Create Apache's log dir /var/log/{{ apache_service }} file: path: "/var/log/{{ apache_service }}" mode: 0755 @@ -161,7 +161,7 @@ group: "{{ apache_user }}" state: directory -- name: Enable httpd +- name: Enable systemd service {{ apache_service }} service: name: "{{ apache_service }}" enabled: yes