diff --git a/roles/lokole/defaults/main.yml b/roles/lokole/defaults/main.yml index 5a65b5009..6bac2fd35 100644 --- a/roles/lokole/defaults/main.yml +++ b/roles/lokole/defaults/main.yml @@ -14,15 +14,9 @@ lokole_enabled: True lokole_url: /lokole lokole_full_url: "http://{{ iiab_hostname }}.{{ iiab_domain }}/{{ lokole_url }}" +lokole_domain_socket: "{{ lokole_install_path }}/lokole_gunicorn.sock" + # Global variables provided by setup-lokole.sh L157-166 # https://github.com/ascoderu/opwen-webapp/blob/master/setup/setup-lokole.sh#L157 -#opwen_network_name: 'Lokole' # use IIAB's wifi -#opwen_network_password: 'Ascoderu' -#opwen_server_read_host: 'api.mailserver.read.lokole.ca' # local-only anyway -#opwen_server_write_host: 'api.mailserver.write.lokole.ca' -#opwen_server_inbox_host: 'api.mailserver.inbox.lokole.ca' opwen_server_locale: '{{ default_language }}' opwen_server_timezone: '{{ local_tz }}' -# opwen_user: lokole # superseded by lokole_user -# opwen_device: "{{ iiab_hostname }}" # just use iiab_hostname -opwen_port: "${LOKOLE_PORT:-80}" # probably unnecessary diff --git a/roles/lokole/templates/lokole.conf.j2 b/roles/lokole/templates/lokole.conf.j2 index ccbebe98e..b31bd771c 100644 --- a/roles/lokole/templates/lokole.conf.j2 +++ b/roles/lokole/templates/lokole.conf.j2 @@ -1,3 +1,6 @@ +ProxyPass {{ lokole_url }} http://unix:{{lokole_domain_socket}} + + Alias {{ lokole_url }} {{ lokole_abs_path }} Options Indexes FollowSymLinks