Merge pull request #2789 from jvonau/lok_user

OPWEN_SETTINGS

roles/lokole/defaults/main.yml

@@ -26,7 +26,8 @@ lokole_user: lokole
 lokole_url: /lokole
 lokole_uid: "2000"
 lokole_run_directory: /home/{{ lokole_user }}/state
-lokole_domain_socket: "/run/lokole_gunicorn.sock"
+lokole_log_directory: /home/{{ lokole_user }}/log
+lokole_domain_socket: "{{ lokole_run_directory }}/lokole_gunicorn.sock"
 lokole_sim_type: LocalOnly
 
 lokole_full_url: "http://{{ iiab_hostname }}.{{ iiab_domain }}{{ lokole_url }}"    # http://box.lan/lokole

roles/lokole/tasks/install.yml

@@ -83,24 +83,25 @@
   file:
     state: directory
     path: "{{ lokole_run_directory }}"
-    #mode: a+x    # Not nec, given above 'state: directory'
+    group: "{{ lokole_user }}"
+    owner: "{{ lokole_user }}"
+    mode: g+rw
 
-# lets try to catch settings.env creation at registration time
+- name: mkdir /{{ lokole_user }}/log
-# can't tell if the routine doesn't like settings.env being missing
-- name: mkdir /{{ lokole_user }}/state for registration testing
   file:
     state: directory
-    path: /{{ lokole_user }}/state
+    path: "{{ lokole_log_directory }}"
+    group: "{{ lokole_user }}"
+    owner: "{{ lokole_user }}"
+    mode: g+rw
 
-- name: Install dummy target for registration testing fake
+- name: Install {{ lokole_run_directory }}/settings.env
-  template:
-    src: settings.env.j2
-    dest: "/{{ lokole_user }}/state/settings.env"
-
-- name: Install dummy target for registration testing run
   template:
     src: settings.env.j2
     dest: "{{ lokole_run_directory }}/settings.env"
+    group: "{{ lokole_user }}"
+    owner: "{{ lokole_user }}"
+    mode: a+rw
 
 - name: Install {{ lokole_run_directory }}/webapp_secrets.sh from template, to configure Lokole
   template:
@@ -112,6 +113,8 @@
   template:
     src: webapp.sh.j2
     dest: "{{ lokole_run_directory }}/webapp.sh"
+    group: "{{ lokole_user }}"
+    owner: "{{ lokole_user }}"
     mode: a+x
 
 - name: Create Lokole admin user with password, for http://box{{ lokole_url }}    # http://box/lokole

roles/lokole/templates/celery.service.j2

@@ -6,6 +6,7 @@ Before=celerybeat.service
 
 [Service]
 Type=simple
+EnvironmentFile={{ lokole_run_directory }}/settings.env
 ExecStart={{ lokole_venv }}/bin/celery --uid={{ lokole_uid }} --gid={{ lokole_uid }} --app=opwen_email_client.webapp.tasks worker --loglevel=info --concurrency=2
 ExecReload=/bin/kill -s HUP $MAINPID
 ExecStop=/bin/kill TERM $MAINPID

roles/lokole/templates/celerybeat.service.j2

@@ -6,6 +6,7 @@ Before=lokole_restarter.service
 
 [Service]
 Type=simple
+EnvironmentFile={{ lokole_run_directory }}/settings.env
 ExecStart={{ lokole_venv }}/bin/celery --app=opwen_email_client.webapp.tasks beat --loglevel=info
 
 [Install]

roles/lokole/templates/lokole.service.j2

@@ -5,6 +5,7 @@ After=network.target
 
 [Service]
 Type=simple
+EnvironmentFile={{ lokole_run_directory }}/settings.env
 ExecStart=/bin/bash {{ lokole_run_directory }}/webapp.sh
 ExecReload=/bin/kill -s HUP $MAINPID
 ExecStop=/bin/kill -s TERM $MAINPID

roles/lokole/templates/lokole_restarter.service.j2

@@ -5,6 +5,7 @@ After=celerybeat.service
 
 [Service]
 Type=simple
+EnvironmentFile={{ lokole_run_directory }}/settings.env
 WorkingDirectory={{ lokole_run_directory }}
 ExecStart={{ lokole_venv }}/bin/manage.py restarter --directory={{ lokole_run_directory }}
 

roles/lokole/templates/settings.env.j2

@@ -1,7 +1,8 @@
-OPWEN_SIM_TYPE='{{ lokole_sim_type }}'
+OPWEN_SETTINGS='{{ lokole_run_directory }}/settings.env'
 OPWEN_STATE_DIRECTORY='{{ lokole_run_directory }}'
 OPWEN_APP_ROOT='{{ lokole_url }}/'
 OPWEN_MAX_UPLOAD_SIZE_MB=10
 OPWEN_SYNC_SCHEDULE='1,16,31,46 * * * *'
 OPWEN_SESSION_KEY='{{ lookup('password', '/dev/null chars=ascii_letters,digits,_ length=32') }}'
 OPWEN_PASSWORD_SALT='{{ lookup('password', '/dev/null chars=ascii_letters,digits,_ length=16') }}'
+OPWEN_SIM_TYPE='{{ lokole_sim_type }}'

roles/lokole/templates/webapp_secrets.sh.j2

@@ -1,3 +1,4 @@
+export OPWEN_SETTINGS='{{ lokole_run_directory }}/settings.env'
 export OPWEN_SIM_TYPE='{{ lokole_sim_type }}'
 export OPWEN_STATE_DIRECTORY='{{ lokole_run_directory }}'
 export OPWEN_APP_ROOT='{{ lokole_url }}/'