diff --git a/roles/web-app-bigbluebutton/tasks/main.yml b/roles/web-app-bigbluebutton/tasks/main.yml index 973adbbc..7afd5f89 100644 --- a/roles/web-app-bigbluebutton/tasks/main.yml +++ b/roles/web-app-bigbluebutton/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: "For '{{ application_id }}': include docker-compose role" +- name: "load docker, proxy for '{{application_id}}'" include_role: name: cmp-docker-proxy diff --git a/roles/web-app-lam/tasks/main.yml b/roles/web-app-lam/tasks/main.yml index 0b6aac33..2d18ad3a 100644 --- a/roles/web-app-lam/tasks/main.yml +++ b/roles/web-app-lam/tasks/main.yml @@ -1,3 +1,3 @@ -- name: "include docker and reverse proxy for {{ application_id }} " - include_role: +- name: "load docker, proxy for '{{application_id}}'" + include_role: name: cmp-docker-proxy diff --git a/roles/web-app-mig/tasks/main.yml b/roles/web-app-mig/tasks/main.yml index 66551b4c..b6f7c975 100644 --- a/roles/web-app-mig/tasks/main.yml +++ b/roles/web-app-mig/tasks/main.yml @@ -14,7 +14,7 @@ mig_roles_meta_list: "{{ mig_roles_meta_volume }}list.json" - name: "load docker, proxy for '{{application_id}}'" - include_role: + include_role: name: cmp-docker-proxy - name: Create tree diff --git a/roles/web-app-navigator/tasks/main.yml b/roles/web-app-navigator/tasks/main.yml index 591203db..dea98ae0 100644 --- a/roles/web-app-navigator/tasks/main.yml +++ b/roles/web-app-navigator/tasks/main.yml @@ -14,8 +14,8 @@ command: pkgmgr path infinito register: path_infinito_output -- name: "include docker and reverse proxy for '{{ application_id }}'" - include_role: +- name: "load docker, proxy for '{{application_id}}'" + include_role: name: cmp-docker-proxy # Hack because it wasn't possible to fix an handler bug in pkgmgr install diff --git a/roles/web-app-pgadmin/tasks/main.yml b/roles/web-app-pgadmin/tasks/main.yml index 528603d2..6f4fc523 100644 --- a/roles/web-app-pgadmin/tasks/main.yml +++ b/roles/web-app-pgadmin/tasks/main.yml @@ -1,6 +1,6 @@ --- -- name: "include docker and reverse proxy for '{{ application_id }}'" - include_role: +- name: "load docker, proxy for '{{application_id}}'" + include_role: name: cmp-docker-proxy - name: "configure pgadmin servers" diff --git a/roles/web-app-phpldapadmin/tasks/main.yml b/roles/web-app-phpldapadmin/tasks/main.yml index f62a28c8..a2a7e64d 100644 --- a/roles/web-app-phpldapadmin/tasks/main.yml +++ b/roles/web-app-phpldapadmin/tasks/main.yml @@ -1,3 +1,3 @@ -- name: "include docker and reverse proxy for '{{ application_id }}'" - include_role: +- name: "load docker, proxy for '{{application_id}}'" + include_role: name: cmp-docker-proxy \ No newline at end of file diff --git a/roles/web-app-phpmyadmin/tasks/main.yml b/roles/web-app-phpmyadmin/tasks/main.yml index b4a31c8b..4f8b5d7a 100644 --- a/roles/web-app-phpmyadmin/tasks/main.yml +++ b/roles/web-app-phpmyadmin/tasks/main.yml @@ -1,4 +1,4 @@ --- -- name: "include docker and reverse proxy for '{{ application_id }}'" - include_role: +- name: "load docker, proxy for '{{application_id}}'" + include_role: name: cmp-docker-proxy diff --git a/roles/web-app-port-ui/tasks/main.yml b/roles/web-app-port-ui/tasks/main.yml index d9ce1a85..0168facf 100644 --- a/roles/web-app-port-ui/tasks/main.yml +++ b/roles/web-app-port-ui/tasks/main.yml @@ -3,8 +3,8 @@ - name: "Validate configuration" include_tasks: "validate.yml" - - name: "include docker and reverse proxy for '{{ application_id }}'" - include_role: + - name: "load docker, proxy for '{{application_id}}'" + include_role: name: cmp-docker-proxy - name: "Check if host-specific config.yaml exists in {{ config_inventory_path }}" diff --git a/roles/web-app-sphinx/tasks/main.yml b/roles/web-app-sphinx/tasks/main.yml index 099a10b8..aeb900b7 100644 --- a/roles/web-app-sphinx/tasks/main.yml +++ b/roles/web-app-sphinx/tasks/main.yml @@ -13,8 +13,8 @@ command: pkgmgr path infinito-sphinx register: path_infinito_sphinx_output -- name: "include docker and reverse proxy for '{{ application_id }}'" - include_role: +- name: "load docker, proxy for '{{application_id}}'" + include_role: name: cmp-docker-proxy # Hack because it wasn't possible to fix an handler bug in pkgmgr install diff --git a/roles/web-svc-logout/tasks/main.yml b/roles/web-svc-logout/tasks/main.yml index 057fcca0..5bba8373 100644 --- a/roles/web-svc-logout/tasks/main.yml +++ b/roles/web-svc-logout/tasks/main.yml @@ -1,18 +1,16 @@ --- +- block: + - name: "load docker, proxy for '{{application_id}}'" + include_role: + name: cmp-docker-proxy -- name: "include docker and reverse proxy for '{{ application_id }}'" - include_role: - name: cmp-docker-proxy - when: run_once_web_svc_logout is not defined + - name: Create symbolic link from .env file to repository + file: + src: "{{ docker_compose.files.env }}" + dest: "{{ [ docker_repository_path, '.env' ] | path_join }}" + state: link -- name: Create symbolic link from .env file to repository - file: - src: "{{ docker_compose.files.env }}" - dest: "{{ [ docker_repository_path, '.env' ] | path_join }}" - state: link - when: run_once_web_svc_logout is not defined - -- name: run the web svc logout tasks once - set_fact: - run_once_web_svc_logout: true + - name: run the web svc logout tasks once + set_fact: + run_once_web_svc_logout: true when: run_once_web_svc_logout is not defined \ No newline at end of file diff --git a/roles/web-svc-simpleicons/tasks/main.yml b/roles/web-svc-simpleicons/tasks/main.yml index 32d00086..24dd1ea0 100644 --- a/roles/web-svc-simpleicons/tasks/main.yml +++ b/roles/web-svc-simpleicons/tasks/main.yml @@ -1,22 +1,21 @@ --- -- name: "include docker and reverse proxy for '{{ application_id }}'" - include_role: - name: cmp-docker-proxy - when: run_once_docker_simpleicons is not defined +- block: + - name: "load docker, proxy for '{{application_id}}'" + include_role: + name: cmp-docker-proxy -- name: "Copy '{{ application_id }}' files" - template: - src: "{{ item.source }}" - dest: "{{ item.target }}" - mode: '0755' - loop: - - { source: "server.js.j2", target: "{{ simpleicons_host_server_file }}" } - - { source: "package.json.j2", target: "{{ simpleicons_host_package_file }}" } - notify: - - docker compose up - when: run_once_docker_simpleicons is not defined - -- name: run the simpleicons tasks once - set_fact: - run_once_docker_simpleicon: true + - name: "Copy '{{ application_id }}' files" + template: + src: "{{ item.source }}" + dest: "{{ item.target }}" + mode: '0755' + loop: + - { source: "server.js.j2", target: "{{ simpleicons_host_server_file }}" } + - { source: "package.json.j2", target: "{{ simpleicons_host_package_file }}" } + notify: + - docker compose up + + - name: run the simpleicons tasks once + set_fact: + run_once_docker_simpleicon: true when: run_once_docker_simpleicons is not defined