Merge pull request #20 from onaio/add-group

Makes Several Improvements to Role

Author: jasonrogena

defaults/main.yml

@@ -40,8 +40,12 @@ django_pid_file: "{{ django_pid_socks_dir }}/{{ django_service_name }}.pid"
 django_proxy_read_timeout: "300s"
 django_environment_script_name: environment.sh
 django_environment_vars: []
+django_celeryd_extra_env_vars: []
+django_celerybeat_extra_env_vars: []
 
 # Python packages
+# Set django_apt_python_ppa to blank string if you don't want to install any PPA
+django_apt_python_ppa: "ppa:deadsnakes/ppa"
 django_recreate_virtual_env: False
 
 ## pipenv
@@ -64,6 +68,7 @@ django_init_commands:
   - collectstatic --noinput
 django_static_path: "/var/www/static/"
 django_media_path: "/var/www/media/"
+django_media_path_mode: "0755"
 django_settings_module:
 
 # template settings path
@@ -115,7 +120,7 @@ django_wsgi_http:
 django_wsgi_socket: "{{ django_pid_socks_dir }}/{{ django_service_name }}.sock"
 django_wsgi_chmod_socket: 777
 django_wsgi_user: "{{ django_system_user }}"
-django_wsgi_group: "www-data"
+django_wsgi_group: "{{ django_system_group }}"
 django_wsgi_vacuum: True
 django_wsgi_master: True
 django_wsgi_logto: "{{ django_log_path }}/uwsgi_{{ django_service_name }}.log"

handlers/main.yml

@@ -1,20 +1,19 @@
 ---
-- name: reload systemctl
-  command: systemctl daemon-reload
-  when:
-    - django_manage_services == True
-
 - name: restart_service
-  service:
+  systemd:
     name: "{{ django_service_name }}"
     state: restarted
+    enabled: true
+    daemon_reload: true
   when:
     - django_manage_services == True
 
 - name: restart_celery
-  service:
+  systemd:
     name: "{{ item }}"
     state: restarted
+    enabled: true
+    daemon_reload: true
   with_items:
     - "{{ django_celeryd_service_name }}"
     - "{{ django_celerybeat_service_name }}"

tasks/celery.yml

@@ -17,7 +17,6 @@
     dest: "/etc/systemd/system/{{ django_celeryd_service_name }}.service"
     mode: 0644
   notify:
-    - reload systemctl
     - restart_celery
 
 - name: Copy celerybeat upstart script
@@ -26,5 +25,4 @@
     dest: "/etc/systemd/system/{{ django_celerybeat_service_name }}.service"
     mode: 0644
   notify:
-    - reload systemctl
     - restart_celery

tasks/configure.yml

@@ -7,22 +7,24 @@
   with_items: "{{ django_init_commands }}"
   become_user: "{{ django_system_user }}"
 
-- name: Changing static folder permission
+- name: Make sure the static folder exists
   file:
     path: "{{ django_static_path }}"
+    state: directory
     owner: "{{ django_system_user }}"
     group: "{{ django_system_group }}"
     mode: 0755
   when:
     - django_static_path is defined
     - django_static_path is not none
 
-- name: Changing mediafolder permission
+- name: Make sure the mediafolder exists
   file:
     path: "{{ django_media_path }}"
+    state: directory
     owner: "{{ django_system_user }}"
     group: "{{ django_system_group }}"
-    mode: 0755
+    mode: "{{ django_media_path_mode }}"
   when:
     - django_media_path is defined
     - django_media_path is not none

tasks/install.yml

@@ -1,3 +1,8 @@
+- name: Add system group
+  group:
+    name: "{{ django_system_group }}"
+    state: present
+
 - name: Add system user
   user:
     name: "{{ django_system_user }}"
@@ -6,10 +11,13 @@
     append: yes
     createhome: yes
 
-- name: Add deadsnakes ppa
-  shell: "add-apt-repository ppa:deadsnakes/ppa -y"
+- name: Add Python PPA
+  apt_repository:
+    repo: "{{ django_apt_python_ppa }}"
+    state: present
   become: true
   become_user: root
+  when: django_apt_python_ppa is defined and django_apt_python_ppa != ""
 
 - name: Update apt cache
   apt:
@@ -42,11 +50,8 @@
   with_items:
     - "{{ django_pid_socks_dir }}"
     - "{{ django_versioned_path }}"
-    - "{{ django_checkout_path }}"
     - "{{ django_venv_path }}"
     - "{{ django_log_path }}"
-    - "{{ django_static_path }}"
-    - "{{ django_media_path }}"
     - "{{ django_system_user_home }}/.ssh"
 
 - name: Copy git key from string

tasks/service.yml

@@ -15,7 +15,6 @@
     dest: /etc/systemd/system/{{ item }}
     mode: 0644
   notify:
-    - reload systemctl
     - restart_service
   with_items:
     - "{{ django_service_name }}.service"

templates/etc/default/celerybeat.j2

@@ -31,3 +31,9 @@ CELERYBEAT_PID_FILE="/var/run/{{ django_system_user }}/celerybeat.pid"
 # in this case is just settings and not the full path because it will change the dir to
 # the project folder first.
 DJANGO_SETTINGS_MODULE="{{ django_settings_module }}"
+
+{% if django_celerybeat_extra_env_vars | length > 0 %}
+{% for var_name,var_value in django_celerybeat_extra_env_vars.items() %}
+{{ var_name }}={{ var_value }}
+{% endfor %}
+{% endif %}

templates/etc/default/celeryd.j2

@@ -36,3 +36,9 @@ CELERY_CREATE_DIRS=1
 C_FORCE_ROOT=1
 CELERYD_LOG_LEVEL="{{ django_celeryd_log_level }}"
 DJANGO_SETTINGS_MODULE="{{ django_settings_module }}"
+
+{% if django_celeryd_extra_env_vars | length > 0 %}
+{% for var_name,var_value in django_celeryd_extra_env_vars.items() %}
+{{ var_name }}={{ var_value }}
+{% endfor %}
+{% endif %}