diff --git a/roles/lokole/defaults/main.yml b/roles/lokole/defaults/main.yml index d1dd5ac8a..5e57203a4 100644 --- a/roles/lokole/defaults/main.yml +++ b/roles/lokole/defaults/main.yml @@ -20,7 +20,7 @@ lokole_venv: "{{ lokole_install_path }}/venv" # /library/lokole/venv # Info needed to run Lokole: lokole_user: lokole lokole_url: /lokole -lokole_run_directory: "/home/{{ lokole_user }}/state" +lokole_run_directory: /home/{{ lokole_user }}/state lokole_domain_socket: "{{ lokole_run_directory }}/lokole_gunicorn.sock" lokole_sim_type: LocalOnly diff --git a/roles/lokole/templates/lokole-nginx.conf.j2 b/roles/lokole/templates/lokole-nginx.conf.j2 index 24d9adc7f..1cd58eb80 100644 --- a/roles/lokole/templates/lokole-nginx.conf.j2 +++ b/roles/lokole/templates/lokole-nginx.conf.j2 @@ -1,14 +1,14 @@ location = {{ lokole_url }}/favicon.ico { - alias /library/lokole/venv/lib/python{{ python_ver }}/site-packages/opwen_email_client/webapp/static/favicon.ico; + alias {{ lokole_venv }}/lib/python{{ python_ver }}/site-packages/opwen_email_client/webapp/static/favicon.ico; } location ~ ^{{ lokole_url }}/static/(.*)$ { - alias /library/lokole/venv/lib/python{{ python_ver }}/site-packages/opwen_email_client/webapp/static/$1; + alias {{ lokole_venv }}/lib/python{{ python_ver }}/site-packages/opwen_email_client/webapp/static/$1; } location {{ lokole_url }}/ { proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://unix:/home/lokole/state/lokole_gunicorn.sock; + proxy_pass http://unix:/{{ lokole_domain_socket }}; }