Merge pull request #16 from onaio/configure-settings-template-path

Configure the source of the local settings path.

Author: jasonrogena

defaults/main.yml

@@ -7,8 +7,10 @@ django_system_user_home: "/home/{{ django_system_user }}"
 django_git_url:
 django_git_version: "master"
 django_git_key:
+django_git_key_ssh_file:
 django_git_key_filename: "id_ed25519"
 django_remove_git_key: True
+django_copy_key_from_file: false
 
 # system-wide dependencies
 django_python_source_version: "3.6"
@@ -64,6 +66,9 @@ django_static_path: "/var/www/static/"
 django_media_path: "/var/www/media/"
 django_settings_module:
 
+# template settings path
+django_settings_template_path: "../templates/local_settings.py.j2"
+
 ## Django settings
 django_settings:
   BASE_DIR: "os.path.dirname(os.path.dirname(__file__))"

tasks/install.yml

@@ -49,7 +49,7 @@
     - "{{ django_media_path }}"
     - "{{ django_system_user_home }}/.ssh"
 
-- name: Copy git key
+- name: Copy git key from string
   copy:
     content: "{{ django_git_key }}"
     dest: "{{ django_system_user_home }}/.ssh/{{ django_git_key_filename }}"
@@ -60,6 +60,17 @@
     - django_git_key is defined
     - django_git_key is not none
 
+- name: Copy git key from file
+  copy:
+    src: "{{ django_git_key }}"
+    dest: "{{ django_system_user_home }}/.ssh/{{ django_git_key_filename }}"
+    owner: "{{ django_system_user }}"
+    mode: 0600
+  no_log: False
+  when:
+    - django_git_key_ssh_file is defined
+    - django_git_key_ssh_file is not none
+
 - name: Git clone with key
   git:
     accept_hostkey: "yes"
@@ -146,7 +157,7 @@
 
 - name: Copy local settings from template
   template:
-    src: local_settings.py.j2
+    src: "{{ django_settings_template_path }}"
     dest: "{{ django_local_settings_path }}"
     owner: "{{ django_system_user }}"
     group: "{{ django_system_group }}"

tests/test.yml

@@ -29,15 +29,15 @@
     django_git_version: "master"
     django_celery_app: "picha"
     django_python_source_version: "2.7"
-    django_python_version: "python2.7"
+    django_python_version: "python3.6"
     django_enable_celery: True
     django_local_settings_path: "{{ django_checkout_path }}/picha/local_settings.py"
     django_settings_module: "picha.settings"
     django_wsgi_module: "picha.wsgi:application"
     django_init_commands:
       - migrate --noinput
     django_pip_packages:
-      - celery
+      - 'celery==3.1.24'
       - uwsgi
       - 'redis==2.10.6'
       - 'django==1.11'
@@ -49,4 +49,4 @@
   gather_facts: True
   become: True
   roles:
-    - role: ../..
+    - role: ../..