From f294ef199d4a194282b9c0e4c8e0ef3c00dfcc3c Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 16 Jan 2020 09:40:32 -0500 Subject: [PATCH] Update fl.yml --- roles/2-common/tasks/fl.yml | 50 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/roles/2-common/tasks/fl.yml b/roles/2-common/tasks/fl.yml index 1c45f9fa5..21038dd3d 100644 --- a/roles/2-common/tasks/fl.yml +++ b/roles/2-common/tasks/fl.yml @@ -1,26 +1,28 @@ # fl.yml signifies "file layout" -- name: Create directories with ownership root:root and permissions 0755 (1 in /etc, 1 in {{ py3_dist_path }}, 3 in {{ iiab_base }} and 15 in /library) # py3_dist_path is /usr/lib/python3/dist-packages, iiab_base is /opt/iiab +- name: "File Layout - Create directories: 1 in /etc, 1 in {{ py3_dist_path }}, 2 in {{ iiab_base }}, 15 in {{ content_base }}" # iiab_base: /opt/iiab file: path: "{{ item }}" - owner: root - group: root - mode: 0755 + # owner: root + # group: root + # mode: '0755' state: directory with_items: - /etc/sysconfig/olpc-scripts/setup.d/installed/ - - "{{ yum_packages_dir }}" - - "{{ pip_packages_dir }}" - - "{{ downloads_dir }}" - - /library/downloads/zims - - /library/downloads/rachel - - /library/downloads/maps - - /library/working/zims - - /library/working/rachel - - /library/working/maps - - "{{ iiab_zim_path }}/content" + - "{{ py3_dist_path }}/iiab" # /usr/lib/python3/dist-packages + - "{{ yum_packages_dir }}" # /opt/iiab/yum-packages + - "{{ pip_packages_dir }}" # /opt/iiab/pip-packages + #- "{{ downloads_dir }}" # /library/downloads auto-created just below + - "{{ downloads_dir }}/zims" + - "{{ downloads_dir }}/maps" + #- "{{ downloads_dir }}/rachel" + #- "{{ content_base }}/working" # /library/working auto-created just below + - "{{ content_base }}/working/zims" + - "{{ content_base }}/working/maps" + #- "{{ content_base }}/library/working/rachel" + - "{{ iiab_zim_path }}/content" # /library/zims - "{{ iiab_zim_path }}/index" - - "{{ doc_root }}/local_content" + - "{{ doc_root }}/local_content" # /library/www/html - "{{ doc_root }}/modules" - "{{ doc_root }}/common/css" - "{{ doc_root }}/common/js" @@ -29,22 +31,20 @@ - "{{ doc_root }}/common/images" - "{{ doc_root }}/common/assets" - "{{ doc_root }}/common/services" - - "{{ py3_dist_path }}/iiab" -- name: Symlink from {{ doc_root }}/common/webfonts to {{ doc_root }}/common/fonts +- name: File Layout - Symlink {{ doc_root }}/common/webfonts -> {{ doc_root }}/common/fonts file: - src: "{{ doc_root }}/common/fonts" + src: "{{ doc_root }}/common/fonts" # /library/www/html path: "{{ doc_root }}/common/webfonts" state: link -- name: Create log files which apache and nginx can write +- name: File Layout - Create log file directories {{ apache_log_dir }} & {{ nginx_log_dir }} file: path: "{{ item }}" - owner: www-data - group: www-data - mode: 0770 + owner: "{{ apache_user }}" # www-data + group: "{{ apache_user }}" # www-data + mode: '0770' state: directory with_items: - - /var/log/apache2 - - "{{ nginx_log_dir }}" - + - "{{ apache_log_dir }}" # /var/log/apache2 typically, as set in /opt/iiab/iiab/vars/.yml + - "{{ nginx_log_dir }}" # /var/log/nginx