From bfe7fac07caaecf2b5e337c54a0eed6da4ed8b00 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 3 Nov 2018 23:23:37 -0400 Subject: [PATCH] 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 0e12493c3..81f8e3c33 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -149,7 +149,7 @@ group: "{{ apache_user }}" state: directory -- name: Enable {{ apache_service }} systemd service +- name: Enable Apache systemd service ({{ apache_service }}) service: name: "{{ apache_service }}" enabled: yes @@ -163,7 +163,7 @@ state: directory # SEE https://github.com/iiab/iiab/issues/1143 as the old roles/osm playbook is rarely used as of late 2018 (if anybody still uses roles/osm, they can overwrite osm.conf using the original osm playbook, or in other ways) -- name: Copy osm.conf to /etc/{{ apache_config_dir }} for http://box/maps (all OS's) +- name: Install /etc/{{ apache_config_dir }}/osm.conf for http://box/maps (all OS's) copy: src: osm.conf dest: "/etc/{{ apache_config_dir }}" @@ -172,7 +172,7 @@ mode: 0644 backup: yes -- name: Create osm.conf symlink from sites-enabled to sites-available (debuntu) +- name: Symlink /etc/apache2/sites-enabled/osm.conf to /etc/{{ apache_config_dir }}/osm.conf (debuntu) file: src: "/etc/{{ apache_config_dir }}/osm.conf" path: /etc/apache2/sites-enabled/osm.conf @@ -184,7 +184,7 @@ tags: - base -# Fixes search @ http://box/modules/es-wikihow - see https://github.com/iiab/iiab/issues/829 +# Partially fixes search @ http://box/modules/es-wikihow (on RPi anyway) see https://github.com/iiab/iiab/issues/829 - include_tasks: php-stem.yml tags: - base @@ -195,14 +195,14 @@ dest: /usr/bin/iiab-refresh-wiki-docs mode: 0755 -- name: Give {{ apache_user }} (per variable apache_user) permission to poweroff +- name: Give {{ apache_user }} (per variable apache_user) permission to poweroff, installing /etc/sudoers.d/020_apache_poweroff from template template: src: 020_apache_poweroff.j2 dest: /etc/sudoers.d/020_apache_poweroff mode: 0755 when: apache_allow_sudo -- name: Remove {{ apache_user }} (per variable apache_user) permission to poweroff +- name: Remove {{ apache_user }} (per variable apache_user) permission to poweroff, removing /etc/sudoers.d/020_apache_poweroff file: path: /etc/sudoers.d/020_apache_poweroff state: absent