diff --git a/roles/3-base-server/tasks/main.yml b/roles/3-base-server/tasks/main.yml index ce1c43212..83a06d30a 100644 --- a/roles/3-base-server/tasks/main.yml +++ b/roles/3-base-server/tasks/main.yml @@ -8,12 +8,6 @@ name: mysql when: mysql_install | bool -- name: WWW_BASE (WWW_OPTIONS should be installed later) - include_role: - name: www_base - #when: www_base_install | bool - #when: apache_install or nginx_install - - name: HTTPD (Apache) include_role: name: httpd @@ -24,6 +18,12 @@ name: nginx when: nginx_install | bool +- name: WWW_BASE (WWW_OPTIONS should be installed later) + include_role: + name: www_base + #when: www_base_install | bool + #when: apache_install or nginx_install + - name: dnsmasq (install now, configure LATER in 'network', after Stage 9) include_tasks: roles/network/tasks/dnsmasq.yml when: dnsmasq_install | bool diff --git a/roles/lokole/README.rst b/roles/lokole/README.rst index cd2267eb8..3557642c5 100644 --- a/roles/lokole/README.rst +++ b/roles/lokole/README.rst @@ -2,7 +2,7 @@ Lokole README ============= -This Ansible role installs the `Lokole web app `_ within Internet-in-a-Box (IIAB). Lokole is a project by the Canadian-Congolese non-profit `Ascoderu `_. +This Ansible role installs the `Lokole web app `_ within Internet-in-a-Box (IIAB). Lokole is a project by the Canadian-Congolese non-profit `Ascoderu `_. The Lokole is a simple email client that offers functionality like: @@ -12,7 +12,7 @@ The Lokole is a simple email client that offers functionality like: 4. Send attachments The Lokole email client is translated into a number of languages, including French and Lingala. -For an up-to-date list of supported languages, refer to the `Lokole translations source `_. +For an up-to-date list of supported languages, refer to the `Lokole translations source `_. Using It -------- @@ -73,7 +73,7 @@ Nightly Internet Email Sync (Not Easy!) The Lokole software can be configured to access the Internet via USB modem, SIM card, or Ethernet, by setting the environment variable ``OPWEN_SIM_TYPE`` in configuration file `/home/lokole/state/webapp_secrets.sh `_. By default, this installation of Lokole is set to local-only (offline) mode, in which users can only send emails to other users on the same Internet-in-a-Box, and cannot send emails over the Internet. This has been done by setting ``OPWEN_SIM_TYPE`` to ``LocalOnly``. -If configured to work with a USB modem or other form of Internet connection, Lokole will sync with the cloud server (operated by `Ascoderu `_) on a nightly basis to deliver and receive emails globally. *However, arranging this is extremely complicated.* You would need a compatible form of connection and an Internet expert familiar with modem protocols, MX records, etc. Ask that person to read the `Lokole software README `_ in its entirety, to help you understand whether this is realistic for your organization. +If configured to work with a USB modem or other form of Internet connection, Lokole will sync with the cloud server (operated by `Ascoderu `_) on a nightly basis to deliver and receive emails globally. *However, arranging this is extremely complicated.* You would need a compatible form of connection and an Internet expert familiar with modem protocols, MX records, etc. Ask that person to read the `Lokole software README `_ in its entirety, to help you understand whether this is realistic for your organization. Lokole and Internet-in-a-Box would welcome a business plan (whether volunteer-based, grant-based or for-profit) from someone willing to operationalize this — making it relatively hassle-free for schools, clinics, libraries and orphanages around the world — that generally do not have access to technical experts. Please `contact us `_ if you have the capacity to help make such a social enterprise happen. @@ -85,4 +85,4 @@ For further usage information and troubleshooting, refer to the `Lokole user man Known Issues ------------ -For an up-to-date list of open issues, please see the `Lokole project's issue tracker `_. See also `IIAB's issue tracker `_. +For an up-to-date list of open issues, please see the `Lokole project's issue tracker `_. See also `IIAB's issue tracker `_. diff --git a/roles/lokole/defaults/main.yml b/roles/lokole/defaults/main.yml index b9cfcfbda..9555e6f53 100644 --- a/roles/lokole/defaults/main.yml +++ b/roles/lokole/defaults/main.yml @@ -8,7 +8,7 @@ # By default, IIAB will always try to install the latest Lokole as published on # https://pypi.org/project/opwen-email-client/ ...OR... HARDCODE EITHER HERE: -#lokole_commit: # OPTIONAL: a 40-char git hash, from https://github.com/ascoderu/opwen-webapp/commits/master +#lokole_commit: # OPTIONAL: a 40-char git hash, from https://github.com/ascoderu/lokole/commits/master #lokole_version: # OPTIONAL: e.g. master or 0.5.10 or a version number from https://pypi.org/project/opwen-email-client/#history lokole_admin_user: admin # lowercase is nec here (even though uppercase Admin/changeme is IIAB's OOB recommendation: BOTH WORK to log in to http://box/lokole) @@ -26,11 +26,3 @@ lokole_url: /lokole lokole_full_url: "http://{{ iiab_hostname }}.{{ iiab_domain }}{{ lokole_url }}" # http://box.lan/lokole lokole_domain_socket: "{{ lokole_run_directory }}/lokole_gunicorn.sock" - -# 2020-02-01: NO LONGER USED, or even meaningful. Delete soon? -# -## Global variables provided by setup-lokole.sh: -## https://github.com/ascoderu/opwen-webapp/blob/master/setup/setup-lokole.sh#L140-L141 -## https://github.com/ascoderu/opwen-webapp/blob/master/setup/setup-lokole.sh#L182-L192 -#opwen_server_locale: "{{ default_language }}" -#opwen_server_timezone: "{{ local_tz }}" diff --git a/roles/lokole/tasks/install.yml b/roles/lokole/tasks/install.yml index 84d217421..d49757e49 100644 --- a/roles/lokole/tasks/install.yml +++ b/roles/lokole/tasks/install.yml @@ -21,7 +21,7 @@ # lokole_commit: - name: "OPTIONAL: pip install opwen_email_client (Lokole, git commit {{ lokole_commit }}) from GitHub to {{ lokole_venv }}, if lokole_commit is defined" pip: - name: "git+https://github.com/ascoderu/opwen-webapp.git@{{ lokole_commit }}#egg=opwen_email_client" + name: "git+https://github.com/ascoderu/lokole.git@{{ lokole_commit }}#egg=opwen_email_client" virtualenv: "{{ lokole_venv }}" virtualenv_command: python3 -m venv "{{ lokole_venv }}" extra_args: --no-cache-dir # To avoid caching issues e.g. soon after new releases hit https://pypi.org/project/opwen-email-client/ diff --git a/runrole b/runrole index 6f49f6319..cb8189a60 100755 --- a/runrole +++ b/runrole @@ -14,7 +14,7 @@ if [ ! -f $PLAYBOOK ]; then exit 1 fi -if [[ $# -eq 0 ]] ; then +if [[ $# -eq 0 ]] || [ "$2" == "--reinstall" ] || [ "$3" == "--reinstall" ] ; then echo "Usage: ./runrole " echo "Usage: ./runrole --reinstall " echo