From bf8b22860592b1a44a3d138689d06fd6d2cab27e Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 27 Jan 2020 03:36:16 -0500 Subject: [PATCH 1/2] Update 2-common/tasks/fl.yml --- roles/2-common/tasks/fl.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/roles/2-common/tasks/fl.yml b/roles/2-common/tasks/fl.yml index 2676d9b3a..3a32dcbbc 100644 --- a/roles/2-common/tasks/fl.yml +++ b/roles/2-common/tasks/fl.yml @@ -1,6 +1,6 @@ # fl.yml signifies "file layout" -- 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 +- name: "File Layout - Create directories: 1 in /etc, 1 in {{ py3_dist_path }}, 3 in {{ iiab_base }}, 15 in {{ content_base }}" # iiab_base: /opt/iiab file: path: "{{ item }}" # owner: root @@ -12,14 +12,13 @@ - "{{ 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" + - "{{ downloads_dir }}" # /opt/iiab/downloads + #- "{{ content_base }}/downloads" # /library/downloads auto-created just below + - "{{ content_base }}/downloads/zims" + - "{{ content_base }}/downloads/maps" #- "{{ 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" # /library/www/html From 64ed0856e615c96a1b4865de7560db0400331c73 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 27 Jan 2020 03:44:26 -0500 Subject: [PATCH 2/2] Update fl.yml --- roles/2-common/tasks/fl.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/2-common/tasks/fl.yml b/roles/2-common/tasks/fl.yml index 3a32dcbbc..603b93c78 100644 --- a/roles/2-common/tasks/fl.yml +++ b/roles/2-common/tasks/fl.yml @@ -1,6 +1,6 @@ # fl.yml signifies "file layout" -- name: "File Layout - Create directories: 1 in /etc, 1 in {{ py3_dist_path }}, 3 in {{ iiab_base }}, 15 in {{ content_base }}" # iiab_base: /opt/iiab +- name: "File Layout - Create directories: 1 in /etc, 1 in {{ py3_dist_path }}, 3 in {{ iiab_base }}, 17 in {{ content_base }}" # iiab_base: /opt/iiab file: path: "{{ item }}" # owner: root @@ -16,9 +16,11 @@ #- "{{ content_base }}/downloads" # /library/downloads auto-created just below - "{{ content_base }}/downloads/zims" - "{{ content_base }}/downloads/maps" + - "{{ content_base }}/downloads/rachel" # STILL USED OR NOT? #- "{{ content_base }}/working" # /library/working auto-created just below - "{{ content_base }}/working/zims" - "{{ content_base }}/working/maps" + - "{{ content_base }}/working/rachel" # STILL USED OR NOT? - "{{ iiab_zim_path }}/content" # /library/zims - "{{ iiab_zim_path }}/index" - "{{ doc_root }}/local_content" # /library/www/html