Remove the uwsgi role, add a cleanup role.

globalInstall.yml

@@ -10,7 +10,6 @@
   roles:
     - systemInit
     - nginx
-    - uwsgi
     - dnsmasq
     - hostapd
     - iptables

roles/cleanup/tasks/uwsgi.yml

@@ -0,0 +1,11 @@
+---
+
+- name: Remove uwsgi installed using pip (bug #17)
+  pip: name=uwsgi state=absent
+  tags:
+  - cleanup
+
+- name: Remove the old service file
+  file: path=/etc/systemd/system/uwsgi.service state=absent
+  tags:
+  - cleanup

roles/mongodb/files/before-uwsgi.conf

@@ -0,0 +1,3 @@
+[Unit]
+# This is needed for BSF Campus
+Before=uwsgi.service

roles/mongodb/tasks/main.yml

@@ -39,8 +39,12 @@
   copy: src=mongodb.service dest=/etc/systemd/system/mongodb.service owner=root group=root
   when: ansible_architecture == 'armhf' or ansible_architecture == 'armv7l' and mongodb.changed
 
-- name: Copy new uwsgi startup file. Uwsgi must start after MongoDB
-  copy: src=uwsgi.service dest=/etc/systemd/system/uwsgi.service owner=root group=root
+- name: Create a mongodb service override unit directory
+  file: path=dest=/etc/systemd/system/mongodb.service.d state=directory owner=root group=root
+  when: ansible_architecture == 'armhf' or ansible_architecture == 'armv7l' and mongodb.changed
+
+- name: Drop in a unit file so uwsgi starts after mongodb
+  copy: src=before-uwsgi.conf dest=/etc/systemd/system/mongodb.service.d/before-uwsgi.conf owner=root group=root
   when: ansible_architecture == 'armhf' or ansible_architecture == 'armv7l' and mongodb.changed
 
 - name: Enable service mongodb

roles/updateMook/files/before-uwsgi.conf

@@ -0,0 +1,3 @@
+[Unit]
+# This is needed for BSF Campus
+Before=uwsgi.service

roles/updateMook/tasks/main.yml

@@ -125,14 +125,17 @@
   copy: src=mongodb.service dest=/etc/systemd/system/mongodb.service owner=root group=root
   when: st.stat.exists == False
 
-- name: Enable service mongodb
-  service: name=mongodb enabled=yes
+- name: Create a mongodb service override unit directory
+  file: dest=/etc/systemd/system/mongodb.service.d state=directory owner=root group=root
   when: st.stat.exists == False
 
-- name: Copy new uwsgi startup file. Uwsgi must start after MongoDB
-  copy: src=uwsgi.service dest=/etc/systemd/system/uwsgi.service owner=root group=root
+- name: Drop in a unit file so uwsgi starts after mongodb
+  copy: src=before-uwsgi.conf dest=/etc/systemd/system/mongodb.service.d/before-uwsgi.conf owner=root group=root
   when: st.stat.exists == False
 
+- name: Enable service mongodb
+  service: name=mongodb enabled=yes
+
 
 ####
 # Systemd startup script
@@ -157,4 +160,4 @@
 
 - name: Update is over, let's reboot!
   command: reboot
-  when: st.stat.exists == False
+  when: st.stat.exists == False