mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-12-02 15:39:57 +00:00
Removed unnecessary blocks
This commit is contained in:
@@ -1,3 +1,2 @@
|
|||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_desk_gnome_caffeine is not defined
|
when: run_once_desk_gnome_caffeine is not defined
|
||||||
|
|||||||
@@ -1,3 +1,2 @@
|
|||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_desk_ssh is not defined
|
when: run_once_desk_ssh is not defined
|
||||||
@@ -1,3 +1,2 @@
|
|||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_dev_yay is not defined
|
when: run_once_dev_yay is not defined
|
||||||
|
|||||||
@@ -6,8 +6,8 @@
|
|||||||
- name: "Load docker container role"
|
- name: "Load docker container role"
|
||||||
include_role:
|
include_role:
|
||||||
name: docker-container
|
name: docker-container
|
||||||
|
|
||||||
when: run_once_docker_container is not defined
|
when: run_once_docker_container is not defined
|
||||||
|
|
||||||
- name: "reset (if enabled)"
|
- name: "reset (if enabled)"
|
||||||
include_tasks: 02_reset.yml
|
include_tasks: 02_reset.yml
|
||||||
when: MODE_RESET | bool
|
when: MODE_RESET | bool
|
||||||
|
|||||||
5
roles/docker-container/tasks/01_core.yml
Normal file
5
roles/docker-container/tasks/01_core.yml
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
- include_role:
|
||||||
|
name: sys-svc-docker
|
||||||
|
when: run_once_sys_svc_docker is not defined
|
||||||
|
|
||||||
|
- include_tasks: utils/run_once.yml
|
||||||
@@ -1,6 +1,2 @@
|
|||||||
- block:
|
- include_tasks: 01_core.yml
|
||||||
- include_role:
|
|
||||||
name: sys-svc-docker
|
|
||||||
when: run_once_sys_svc_docker is not defined
|
|
||||||
- include_tasks: utils/run_once.yml
|
|
||||||
when: run_once_docker_container is not defined
|
when: run_once_docker_container is not defined
|
||||||
@@ -1,3 +1,2 @@
|
|||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_svc_opt_swapfile is not defined
|
when: run_once_svc_opt_swapfile is not defined
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
|
- include_tasks: utils/run_once.yml
|
||||||
|
|
||||||
- name: Include dependencies
|
- name: Include dependencies
|
||||||
include_role:
|
include_role:
|
||||||
name: "sys-svc-msmtp"
|
name: "sys-svc-msmtp"
|
||||||
when: run_once_sys_svc_msmtp is not defined or run_once_sys_svc_msmtp is false
|
when: not run_once_sys_svc_msmtp | default(false)
|
||||||
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: sys-service
|
name: sys-service
|
||||||
@@ -9,5 +11,3 @@
|
|||||||
# If the email notifier fails, trigger the Telegram notifier,
|
# If the email notifier fails, trigger the Telegram notifier,
|
||||||
# passing the failing unit's name as the instance text.
|
# passing the failing unit's name as the instance text.
|
||||||
system_service_tpl_on_failure: "{{ ('sys-ctl-alm-telegram@') | get_service_name(SOFTWARE_NAME, False) }}%n.service"
|
system_service_tpl_on_failure: "{{ ('sys-ctl-alm-telegram@') | get_service_name(SOFTWARE_NAME, False) }}%n.service"
|
||||||
|
|
||||||
- include_tasks: utils/run_once.yml
|
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_sys_ctl_alm_email is not defined
|
when: not run_once_sys_ctl_alm_email | default(false)
|
||||||
@@ -1,3 +1,2 @@
|
|||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_sys_ctl_cln_bkps is not defined
|
when: run_once_sys_ctl_cln_bkps is not defined
|
||||||
|
|||||||
@@ -1,3 +1,2 @@
|
|||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_sys_ctl_cln_faild_bkps is not defined
|
when: run_once_sys_ctl_cln_faild_bkps is not defined
|
||||||
@@ -1,3 +1,2 @@
|
|||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_sys_ctl_hlth_csp is not defined
|
when: run_once_sys_ctl_hlth_csp is not defined
|
||||||
@@ -1,3 +1,2 @@
|
|||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_sys_ctl_hlth_msmtp is not defined
|
when: run_once_sys_ctl_hlth_msmtp is not defined
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_sys_ctl_hlth_webserver is not defined
|
when: run_once_sys_ctl_hlth_webserver is not defined
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,2 @@
|
|||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_sys_ctl_rpr_docker_hard is not defined
|
when: run_once_sys_ctl_rpr_docker_hard is not defined
|
||||||
@@ -1,3 +1,2 @@
|
|||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_sys_ctl_rpr_docker_soft is not defined
|
when: run_once_sys_ctl_rpr_docker_soft is not defined
|
||||||
@@ -1,3 +1,2 @@
|
|||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_sys_dns_wildcards is not defined
|
when: run_once_sys_dns_wildcards is not defined
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: DNS_PROVIDER == 'cloudflare'
|
when:
|
||||||
when: run_once_sys_svc_dns is not defined
|
- DNS_PROVIDER == 'cloudflare'
|
||||||
|
- run_once_sys_svc_dns is not defined
|
||||||
|
|||||||
@@ -1,3 +1,2 @@
|
|||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_sys_svc_letsencrypt is not defined
|
when: run_once_sys_svc_letsencrypt is not defined
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
---
|
---
|
||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_sys_svc_webserver_core is not defined
|
when: run_once_sys_svc_webserver_core is not defined
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
---
|
---
|
||||||
- block:
|
|
||||||
- include_tasks: 01_core.yml
|
- include_tasks: 01_core.yml
|
||||||
when: run_once_web_app_xwiki is not defined
|
when: run_once_web_app_xwiki is not defined
|
||||||
|
|||||||
Reference in New Issue
Block a user