From be751cf3fefd4c497848a6ae8a2eb9ff7bd811fa Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 21 May 2021 12:19:50 -0400 Subject: [PATCH 1/6] lokole/tasks/main.yml: Comment out Apache --- roles/lokole/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/lokole/tasks/main.yml b/roles/lokole/tasks/main.yml index 9f186a60e..ff0f1836a 100644 --- a/roles/lokole/tasks/main.yml +++ b/roles/lokole/tasks/main.yml @@ -54,13 +54,13 @@ - lokole #- name: SHIM FOR NOW SO ALWAYS DO THE...Enable/Disable/Restart Apache -- name: Enable/Disable/Restart Apache if primary - include_tasks: apache.yml - when: not nginx_enabled +#- name: Enable/Disable/Restart Apache if primary +# include_tasks: apache.yml +# when: not nginx_enabled -- name: Enable/Disable/Restart NGINX if primary +- name: Enable/Disable/Restart NGINX include_tasks: nginx.yml - when: nginx_enabled + #when: nginx_enabled - name: Add 'lokole' variable values to {{ iiab_ini_file }} From 327a4e62ee15ea3558b64bd35380cb47340af434 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 21 May 2021 12:21:38 -0400 Subject: [PATCH 2/6] lokole/tasks/install.yml: Further comment out Apache --- roles/lokole/tasks/install.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/lokole/tasks/install.yml b/roles/lokole/tasks/install.yml index b5aec38ff..67d40520e 100644 --- a/roles/lokole/tasks/install.yml +++ b/roles/lokole/tasks/install.yml @@ -122,12 +122,12 @@ . {{ lokole_run_directory }}/webapp_secrets.sh {{ lokole_venv }}/bin/manage.py createadmin --name='{{ lokole_admin_user }}' --password='{{ lokole_admin_password }}' -- name: Install /etc/{{ apache_conf_dir }}/lokole.conf from template, for http://box{{ lokole_url }} via Apache # http://box/lokole - template: - src: lokole.conf.j2 - dest: "/etc/{{ apache_conf_dir }}/lokole.conf" - mode: 0644 - when: apache_install +#- name: Install /etc/{{ apache_conf_dir }}/lokole.conf from template, for http://box{{ lokole_url }} via Apache # http://box/lokole +# template: +# src: lokole.conf.j2 +# dest: "/etc/{{ apache_conf_dir }}/lokole.conf" +# mode: 0644 +# when: apache_install - name: Install unit files {lokole.service, celery.service, celerybeat.service, lokole_restarter.service} into /etc/systemd/system, from template template: From 28f31941096029a9dc49392f0086510ecfc1a322 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 21 May 2021 12:22:54 -0400 Subject: [PATCH 3/6] Rename lokole/tasks/apache.yml to apache.yml.unused --- roles/lokole/tasks/{apache.yml => apache.yml.unused} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename roles/lokole/tasks/{apache.yml => apache.yml.unused} (100%) diff --git a/roles/lokole/tasks/apache.yml b/roles/lokole/tasks/apache.yml.unused similarity index 100% rename from roles/lokole/tasks/apache.yml rename to roles/lokole/tasks/apache.yml.unused From 26b6ecb46abb2943a5bc7a88934658724b661145 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 6 Jul 2021 02:36:02 -0400 Subject: [PATCH 4/6] lokole/tasks/install.yml: Remove Apache residue --- roles/lokole/tasks/install.yml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/roles/lokole/tasks/install.yml b/roles/lokole/tasks/install.yml index 3678b98b3..61a2e70f1 100644 --- a/roles/lokole/tasks/install.yml +++ b/roles/lokole/tasks/install.yml @@ -2,16 +2,6 @@ # https://github.com/iiab/iiab/blob/master/roles/www_base/templates/iiab-refresh-wiki-docs.sh#L51-L52 -#- name: "Set 'apache_install: True' and 'apache_enabled: True'" -# set_fact: -# apache_install: True -# apache_enabled: True - -#- name: APACHE - run 'httpd' role -# include_role: -# name: httpd - - - name: "Install 8 packages for Lokole: python3, python3-pip, python3-venv, python3-dev, python3-bcrypt, libffi-dev, libssl-dev, libopenjp2-7" apt: name: @@ -140,19 +130,13 @@ - name: Create Lokole admin user with password, for http://box{{ lokole_url }} # http://box/lokole include_tasks: setup.yml -#- name: Install /etc/{{ apache_conf_dir }}/lokole.conf from template, for http://box{{ lokole_url }} via Apache # http://box/lokole -# template: -# src: lokole.conf.j2 -# dest: "/etc/{{ apache_conf_dir }}/lokole.conf" -# mode: 0644 -# when: apache_install + +# RECORD Lokole AS INSTALLED - name: "Set 'lokole_installed: True'" set_fact: lokole_installed: True -# RECORD Lokole AS INSTALLED - - name: "Add 'lokole_installed: True' to {{ iiab_state_file }}" lineinfile: path: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml From 1883c777bf8a14b14d133f4309c4df20ce319bdb Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 6 Jul 2021 02:40:18 -0400 Subject: [PATCH 5/6] roles/nginx/README.md: Update Lokole's status, to "NGINX only" --- roles/nginx/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nginx/README.md b/roles/nginx/README.md index 785d8eba0..ff0f4c4a7 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -18,6 +18,7 @@ * captiveportal * IIAB documentation (http://box/info) * jupyterhub + * lokole * moodle * nodered * osm-vector-maps @@ -31,7 +32,6 @@ * gitea * kiwix * kolibri - * lokole * mediawiki * munin * nextcloud From dec1018b67ec7aebb90a50c184f7f75169560518 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 6 Jul 2021 02:45:21 -0400 Subject: [PATCH 6/6] Lint lokole/tasks/install.yml --- roles/lokole/tasks/install.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/lokole/tasks/install.yml b/roles/lokole/tasks/install.yml index 61a2e70f1..6085659ae 100644 --- a/roles/lokole/tasks/install.yml +++ b/roles/lokole/tasks/install.yml @@ -21,7 +21,6 @@ - mobile-broadband-provider-info - ppp - wvdial - state: present # For development purposes -- To install Lokole from a given commit, add the