1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00

Merge pull request #2794 from holta/lokole-with-less-apache

Lokole with less Apache
This commit is contained in:
A Holt 2021-07-06 02:53:34 -04:00 committed by GitHub
commit c6e1452694
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 26 deletions

View file

@ -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:
@ -31,7 +21,6 @@
- mobile-broadband-provider-info
- ppp
- wvdial
state: present
# For development purposes -- To install Lokole from a given commit, add the
@ -140,19 +129,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

View file

@ -43,13 +43,8 @@
state: stopped
when: not lokole_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
- name: Add 'lokole' variable values to {{ iiab_ini_file }}

View file

@ -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