sandbox-ora: Allow to configure the user used by ORA

playbooks/roles/ora/tasks/deploy.yml

@@ -41,7 +41,7 @@
 
 # Do Post Checkout Tasks.
 - name: ora | change permissions on ora code dir
-  file: path={{ora_code_dir}} state=directory owner=www-data group=www-data mode=755 recurse=yes
+  file: path={{ora_code_dir}} state=directory owner={{ ora_user }} group={{ ora_user }} mode=755 recurse=yes
   notify:
     - ora | restart edx-ora
     - ora | restart edx-ora-celery
@@ -85,7 +85,7 @@
   - deploy
 
 - name: ora | syncdb and migrate
-  shell: sudo -u www-data {{ora_venv_dir}}/bin/django-admin.py syncdb --migrate --noinput --settings=edx_ora.aws --pythonpath={{ora_code_dir}}
+  shell: sudo -u {{ ora_user }} {{ora_venv_dir}}/bin/django-admin.py syncdb --migrate --noinput --settings=edx_ora.aws --pythonpath={{ora_code_dir}}
   when: migrate_db is defined and migrate_db|lower == "yes"
   notify:
     - ora | restart edx-ora
@@ -96,7 +96,7 @@
   - deploy
 
 - name: ora | create users
-  shell: sudo -u www-data {{ora_venv_dir}}/bin/django-admin.py update_users --settings=edx_ora.aws --pythonpath={{ora_code_dir}}
+  shell: sudo -u {{ ora_user }} {{ora_venv_dir}}/bin/django-admin.py update_users --settings=edx_ora.aws --pythonpath={{ora_code_dir}}
   notify:
     - ora | restart edx-ora
     - ora | restart edx-ora-celery

playbooks/roles/ora/tasks/ease.yml

@@ -37,7 +37,7 @@
 
 # Do Post Checkout Tasks.
 - name: ora | change permissions on ease code dir
-  file: path={{ease_code_dir}} state=directory owner=www-data group=www-data mode=755 recurse=yes
+  file: path={{ease_code_dir}} state=directory owner={{ ora_user }} group={{ ora_user }} mode=755 recurse=yes
   tags:
   - ease
   - deploy

playbooks/roles/ora/tasks/main.yml

@@ -9,7 +9,7 @@
   - ora
 
 - name: ora | Create ml_models directory
-  file: path={{ora_code_dir}}/../ml_models state=directory owner=www-data group=www-data
+  file: path={{ora_code_dir}}/../ml_models state=directory owner={{ ora_user }} group={{ ora_user }}
   tags:
   - ora
 
@@ -20,12 +20,12 @@
   - ora
 
 - name: ora | create ora application config
-  template: src=ora.env.json.j2 dest={{ora_code_dir}}/../env.json mode=0640 owner=www-data group=adm
+  template: src=ora.env.json.j2 dest={{ora_code_dir}}/../env.json mode=0640 owner={{ ora_user }} group=adm
   tags:
   - ora
 
 - name: ora | create ora auth file
-  template: src=ora.auth.json.j2 dest={{ora_code_dir}}/../auth.json mode=0640 owner=www-data group=adm
+  template: src=ora.auth.json.j2 dest={{ora_code_dir}}/../auth.json mode=0640 owner={{ ora_user }} group=adm
   tags:
   - ora
 

playbooks/roles/ora/templates/edx-ora-celery.conf.j2

@@ -12,6 +12,6 @@ respawn limit 3 30
 env DJANGO_SETTINGS_MODULE=edx_ora.aws
 
 chdir {{ ora_code_dir }}
-setuid www-data
+setuid {{ ora_user }}
 
 exec {{ ora_venv_dir }}/bin/python {{ ora_code_dir }}/manage.py celeryd --loglevel=info --settings=edx_ora.aws --pythonpath={{ ora_code_dir}} -B --autoscale=4,1

playbooks/roles/ora/templates/edx-ora.conf.j2

@@ -19,6 +19,6 @@ pre-start script
 end script
 
 chdir {{ ora_code_dir }}
-setuid www-data
+setuid {{ ora_user }}
 
 exec {{ ora_venv_dir}}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=90 --pythonpath={{ ora_code_dir}} edx_ora.wsgi

playbooks/roles/ora/vars/main.yml

@@ -6,6 +6,7 @@ ora_code_dir: "{{ app_base_dir }}/edx-ora"
 # to serve all content on port 80
 ora_venv_dir: "{{ venv_dir }}"
 ease_venv_dir: "{{ venv_dir }}"
+ora_user: "www-data"
 ora_gunicorn_workers: 4
 ora_nginx_port: 18091
 ora_gunicorn_port: 8091