Merge remote-tracking branch 'origin' into jarv/cert-fixes

playbooks/roles/devpi/defaults/main.yml

@@ -22,3 +22,5 @@ devpi_supervisor_cfg_dir: "{{ devpi_supervisor_app_dir }}/conf.d"
 devpi_supervisor_data_dir: "{{ devpi_data_dir }}/supervisor"
 devpi_supervisor_cfg: "{{ devpi_supervisor_app_dir }}/supervisor.conf"
 devpi_supervisor_log_dir: "{{ devpi_log_dir }}/supervisor"
+devpi_supervisor_venv_dir: "{{ devpi_app_dir }}/venvs/supervisor"
+devpi_supervisor_venv_bin: "{{ devpi_supervisor_venv_dir }}/bin"

playbooks/roles/devpi/meta/main.yml

+---
+dependencies:
+  - role: supervisor
+    supervisor_app_dir: $devpi_supervisor_app_dir
+    supervisor_data_dir: $devpi_supervisor_data_dir
+    supervisor_log_dir: $devpi_supervisor_log_dir
+    supervisor_venv_dir: $devpi_supervisor_venv_dir
+    supervisor_service_user: $devpi_supervisor_user
+    supervisor_service: "supervisor.devpi"

playbooks/roles/devpi/tasks/main.yml

@@ -46,7 +46,6 @@
   - "{{ devpi_app_dir }}"
   - "{{ devpi_venv_dir }}"
 
-
 - name: devpi | create the devpi data directory, needs write access by the service user
   file: >
     path={{ item }}
@@ -72,7 +71,7 @@
     owner={{ devpi_user }} group={{ devpi_user }} mode=0644
   notify: supervisor | restart supervisor
 
-- name: devpi | create a symlink for venv python, pip and supervisor
+- name: devpi | create a symlink for venv python, pip
   file: >
     src="{{ devpi_venv_bin }}/{{ item }}"
     dest={{ COMMON_BIN_DIR }}/{{ item }}.devpi
@@ -80,7 +79,12 @@
   with_items:
   - python
   - pip
-  - supervisorctl
+
+- name: devpi | create a symlink for venv supervisor
+  file: >
+    src="{{ devpi_supervisor_venv_bin }}/supervisorctl"
+    dest={{ COMMON_BIN_DIR }}/{{ item }}.devpi
+    state=link
 
 - name: devpi | create a symlink for supervisor config
   file: >