mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2024-11-21 12:21:04 +01:00
Removed buggy variable mapping
This commit is contained in:
parent
273a785453
commit
ece4fe465e
@ -1,20 +1,11 @@
|
||||
---
|
||||
- name: variable mapping
|
||||
hosts: all
|
||||
vars:
|
||||
activate_all_timers: "{{ activate_all_timers | lower | bool }}"
|
||||
nginx_matomo_tracking: "{{ nginx_matomo_tracking | lower | bool }}"
|
||||
execute_updates: "{{ execute_updates | lower | bool }}"
|
||||
force_backup_before_update: "{{ force_backup_before_update | lower | bool }}"
|
||||
enable_central_database: "{{ enable_central_database | lower | bool }}"
|
||||
|
||||
- name: update device
|
||||
hosts: all
|
||||
become: true
|
||||
tasks:
|
||||
roles:
|
||||
- role: update
|
||||
when: execute_updates
|
||||
when: execute_updates | bool
|
||||
|
||||
- name: setup standard wireguard
|
||||
hosts: wireguard_server
|
||||
|
@ -37,7 +37,7 @@
|
||||
- name: configure backup-docker-to-local.timer.tpl
|
||||
template: src=backup-docker-to-local.timer.j2 dest=/etc/systemd/system/backup-docker-to-local.timer
|
||||
register: backup_docker_to_local_timer
|
||||
changed_when: backup_docker_to_local_timer.changed or activate_all_timers
|
||||
changed_when: backup_docker_to_local_timer.changed or activate_all_timers | bool
|
||||
notify: restart backup-docker-to-local.timer
|
||||
when: run_once_backup_docker_to_local is not defined
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
- name: create backup-remote-to-local.timer
|
||||
template: src=backup-remote-to-local.timer.j2 dest=/etc/systemd/system/backup-remote-to-local.timer
|
||||
register: backup_backup_remote_to_local_timer
|
||||
changed_when: backup_backup_remote_to_local_timer.changed or activate_all_timers
|
||||
changed_when: backup_backup_remote_to_local_timer.changed or activate_all_timers | bool
|
||||
notify: restart backup-remote-to-local timer
|
||||
|
||||
- name: create backups-remote-to-local.sh
|
||||
|
@ -3,7 +3,7 @@
|
||||
src: "cleanup-backups.timer.j2"
|
||||
dest: "/etc/systemd/system/cleanup-backups.timer"
|
||||
register: cleanup_backups_timer
|
||||
changed_when: cleanup_backups_timer.changed or activate_all_timers
|
||||
changed_when: cleanup_backups_timer.changed or activate_all_timers | bool
|
||||
notify: restart cleanup-backups.timer
|
||||
when: run_once_cleanup_backups_timer is not defined
|
||||
|
||||
|
@ -20,5 +20,5 @@
|
||||
src: cleanup-disc-space.timer.j2
|
||||
dest: /etc/systemd/system/cleanup-disc-space.timer
|
||||
register: cleanup_disc_space_timer
|
||||
changed_when: cleanup_disc_space_timer.changed or activate_all_timers
|
||||
changed_when: cleanup_disc_space_timer.changed or activate_all_timers | bool
|
||||
notify: restart cleanup-disc-space.timer
|
@ -24,7 +24,7 @@
|
||||
src: cleanup-failed-docker-backups.timer.j2
|
||||
dest: /etc/systemd/system/cleanup-failed-docker-backups.timer
|
||||
register: cleanup_failed_docker_backups_timer
|
||||
changed_when: cleanup_failed_docker_backups_timer.changed or activate_all_timers
|
||||
changed_when: cleanup_failed_docker_backups_timer.changed or activate_all_timers | bool
|
||||
notify: restart cleanup-failed-docker-backups.timer
|
||||
when: run_once_cleanup_failed_docker_backups is not defined
|
||||
|
||||
|
@ -71,13 +71,13 @@ env:
|
||||
DISCOURSE_SMTP_DOMAIN: {{ system_email_domain }}
|
||||
DISCOURSE_NOTIFICATION_EMAIL: {{ system_email }}
|
||||
|
||||
{% if enable_central_database %}
|
||||
{% if enable_central_database | bool %}
|
||||
# Database Configuration
|
||||
DISCOURSE_DB_USERNAME: {{ database_username }}
|
||||
DISCOURSE_DB_PASSWORD: {{ database_password }}
|
||||
DISCOURSE_DB_HOST: {{ database_host }}
|
||||
DISCOURSE_DB_NAME: {{ database_databasename }}
|
||||
{% if enable_central_database %}
|
||||
{% if enable_central_database | bool %}
|
||||
|
||||
## If you added the Lets Encrypt template, uncomment below to get a free SSL certificate
|
||||
#LETSENCRYPT_ACCOUNT_EMAIL: administrator@veen.world
|
||||
|
@ -64,5 +64,5 @@
|
||||
src: "deploy-letsencrypt-mailu.timer.j2"
|
||||
dest: "/etc/systemd/system/deploy-letsencrypt-mailu.timer"
|
||||
register: deploy_letsencrypt_mailu_timer
|
||||
changed_when: deploy_letsencrypt_mailu_timer.changed or activate_all_timers
|
||||
changed_when: deploy_letsencrypt_mailu_timer.changed or activate_all_timers | bool
|
||||
notify: restart deploy-letsencrypt-mailu.timer
|
@ -8,7 +8,7 @@ server {
|
||||
|
||||
{% include 'roles/letsencrypt/templates/ssl_header.j2' %}
|
||||
|
||||
{% if nginx_matomo_tracking %}
|
||||
{% if nginx_matomo_tracking | bool %}
|
||||
{% include 'roles/nginx-matomo-tracking/templates/matomo-tracking.conf.j2' %}
|
||||
{% endif %}
|
||||
|
||||
|
@ -4,7 +4,7 @@ server
|
||||
|
||||
{% include 'roles/letsencrypt/templates/ssl_header.j2' %}
|
||||
|
||||
{% if nginx_matomo_tracking %}
|
||||
{% if nginx_matomo_tracking | bool %}
|
||||
{% include 'roles/nginx-matomo-tracking/templates/matomo-tracking.conf.j2' %}
|
||||
{% endif %}
|
||||
|
||||
|
@ -3,7 +3,7 @@ server {
|
||||
|
||||
{% include 'roles/letsencrypt/templates/ssl_header.j2' %}
|
||||
|
||||
{% if nginx_matomo_tracking %}
|
||||
{% if nginx_matomo_tracking | bool %}
|
||||
{% include 'roles/nginx-matomo-tracking/templates/matomo-tracking.conf.j2' %}
|
||||
{% endif %}
|
||||
|
||||
|
@ -23,7 +23,7 @@
|
||||
src: heal-docker.timer.j2
|
||||
dest: "/etc/systemd/system/heal-docker.timer"
|
||||
register: heal_docker_timer
|
||||
changed_when: heal_docker_timer.changed or activate_all_timers
|
||||
changed_when: heal_docker_timer.changed or activate_all_timers | bool
|
||||
notify: restart heal-docker.timer
|
||||
when: run_once_heal_docker is not defined
|
||||
|
||||
|
@ -20,5 +20,5 @@
|
||||
src: health-btrfs.timer.j2
|
||||
dest: "/etc/systemd/system/health-btrfs.timer"
|
||||
register: health_btrs_timer
|
||||
changed_when: health_btrs_timer.changed or activate_all_timers
|
||||
changed_when: health_btrs_timer.changed or activate_all_timers | bool
|
||||
notify: restart health-btrfs.timer
|
||||
|
@ -20,5 +20,5 @@
|
||||
src: health-disc-space.timer.j2
|
||||
dest: /etc/systemd/system/health-disc-space.timer
|
||||
register: health_disc_space_timer
|
||||
changed_when: health_disc_space_timer.changed or activate_all_timers
|
||||
changed_when: health_disc_space_timer.changed or activate_all_timers | bool
|
||||
notify: restart health-disc-space.timer
|
||||
|
@ -21,7 +21,7 @@
|
||||
src: health-docker-container.timer.j2
|
||||
dest: "/etc/systemd/system/health-docker-container.timer"
|
||||
register: health_docker_container_timer
|
||||
changed_when: health_docker_container_timer.changed or activate_all_timers
|
||||
changed_when: health_docker_container_timer.changed or activate_all_timers | bool
|
||||
notify: restart health-docker-container.timer
|
||||
when: run_once_health_docker_container is not defined
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
src: health-docker-volumes.timer.j2
|
||||
dest: "/etc/systemd/system/health-docker-volumes.timer"
|
||||
register: health_docker_volumes_timer
|
||||
changed_when: health_docker_volumes_timer.changed or activate_all_timers
|
||||
changed_when: health_docker_volumes_timer.changed or activate_all_timers | bool
|
||||
notify: restart health-docker-volumes.timer
|
||||
when: run_once_health_docker_volumes is not defined
|
||||
|
||||
|
@ -20,5 +20,5 @@
|
||||
src: health-journalctl.timer.j2
|
||||
dest: /etc/systemd/system/health-journalctl.timer
|
||||
register: health_journalctl_timer
|
||||
changed_when: health_journalctl_timer.changed or activate_all_timers
|
||||
changed_when: health_journalctl_timer.changed or activate_all_timers | bool
|
||||
notify: restart health-journalctl.timer
|
||||
|
@ -29,7 +29,7 @@
|
||||
src: health-nginx.timer.j2
|
||||
dest: "/etc/systemd/system/health-nginx.timer"
|
||||
register: health_nginx_timer
|
||||
changed_when: health_nginx_timer.changed or activate_all_timers
|
||||
changed_when: health_nginx_timer.changed or activate_all_timers | bool
|
||||
notify: restart health-nginx.timer
|
||||
when: run_once_health_nginx is not defined
|
||||
|
||||
|
@ -31,7 +31,7 @@ for filename in os.listdir(config_path):
|
||||
# Determine expected status codes based on the domain
|
||||
if domain == '{{domain_listmonk}}':
|
||||
expected_statuses = [401]
|
||||
{% if nginx_matomo_tracking %}
|
||||
{% if nginx_matomo_tracking | bool %}
|
||||
elif parts[0] == 'www' or domain in redirected_domains:
|
||||
expected_statuses = [301]
|
||||
{% endif %}
|
||||
|
@ -16,7 +16,7 @@
|
||||
src: certbot.timer.j2
|
||||
dest: /etc/systemd/system/certbot.timer
|
||||
register: certbot_timer
|
||||
changed_when: certbot_timer.changed or activate_all_timers
|
||||
changed_when: certbot_timer.changed or activate_all_timers | bool
|
||||
notify: restart certbot timer
|
||||
when: run_once_nginx_certbot is not defined
|
||||
|
||||
|
@ -3,7 +3,7 @@ server
|
||||
server_name {{domain}};
|
||||
|
||||
# Include Matomo Tracking Code
|
||||
{% if nginx_matomo_tracking %}
|
||||
{% if nginx_matomo_tracking | bool %}
|
||||
{% include 'roles/nginx-matomo-tracking/templates/matomo-tracking.conf.j2' %}
|
||||
{% endif %}
|
||||
|
||||
|
@ -5,7 +5,7 @@ server
|
||||
|
||||
{% include 'roles/letsencrypt/templates/ssl_header.j2' %}
|
||||
|
||||
{% if nginx_matomo_tracking %}
|
||||
{% if nginx_matomo_tracking | bool %}
|
||||
{% include 'roles/nginx-matomo-tracking/templates/matomo-tracking.conf.j2' %}
|
||||
{% endif %}
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
systemd:
|
||||
name: backup-docker-to-local-everything.service
|
||||
state: started
|
||||
when: force_backup_before_update
|
||||
when: force_backup_before_update | bool
|
||||
|
||||
- name: create {{update_docker_script}}
|
||||
copy:
|
||||
|
@ -1,4 +1,4 @@
|
||||
- name: Activate NGINX matomo tracking
|
||||
include_role:
|
||||
name: nginx-matomo-tracking
|
||||
when: nginx_matomo_tracking and domain is defined
|
||||
when: nginx_matomo_tracking | bool and domain is defined
|
@ -1,6 +1,6 @@
|
||||
# This template needs to be included in docker-compose.yml
|
||||
networks:
|
||||
{% if enable_central_database %}
|
||||
{% if enable_central_database | bool %}
|
||||
central_{{ database_type }}_network:
|
||||
external: true
|
||||
{% endif %}
|
||||
|
@ -1,5 +1,5 @@
|
||||
# This needs to be included in docker-compose.yml which just contain a database volume
|
||||
{% if not enable_central_database %}
|
||||
{% if not enable_central_database | bool %}
|
||||
volumes:
|
||||
database:
|
||||
{% endif %}
|
@ -1,5 +1,5 @@
|
||||
# This template needs to be included in docker-compose.yml which contain a database and additional volumes
|
||||
volumes:
|
||||
{% if not enable_central_database %}
|
||||
{% if not enable_central_database | bool %}
|
||||
database:
|
||||
{% endif %}
|
@ -1,6 +1,6 @@
|
||||
# This template needs to be included in docker-compose.yml containers which depend on a database and additional containers
|
||||
depends_on:
|
||||
{% if enable_central_database %}
|
||||
{% if enable_central_database | bool %}
|
||||
database:
|
||||
condition: service_healthy
|
||||
{% endif %}
|
@ -1,6 +1,6 @@
|
||||
# This template needs to be included in docker-compose.yml contaienrs, which depend on a database, redis and optional additional volumes
|
||||
depends_on:
|
||||
{% if enable_central_database %}
|
||||
{% if enable_central_database | bool %}
|
||||
database:
|
||||
condition: service_healthy
|
||||
{% endif %}
|
||||
|
@ -1,5 +1,5 @@
|
||||
# This template needs to be included in docker-compose.yml contaienrs, which just depend on a database
|
||||
{% if enable_central_database %}
|
||||
{% if enable_central_database | bool %}
|
||||
depends_on:
|
||||
database:
|
||||
condition: service_healthy
|
||||
|
@ -1,6 +1,6 @@
|
||||
# This template needs to be included in docker-compose.yml containers
|
||||
networks:
|
||||
- {{docker_compose_project_name}}_network
|
||||
{% if enable_central_database %}
|
||||
{% if enable_central_database | bool %}
|
||||
- central_{{ database_type }}_network
|
||||
{% endif %}
|
@ -1,5 +1,5 @@
|
||||
# This template needs to be included in docker-compose.yml, which depend on a mariadb database
|
||||
{% if not enable_central_database %}
|
||||
{% if not enable_central_database | bool %}
|
||||
database:
|
||||
logging:
|
||||
driver: journald
|
||||
|
@ -1,5 +1,5 @@
|
||||
# This template needs to be included in docker-compose.yml, which depend on a postgres database
|
||||
{% if not enable_central_database %}
|
||||
{% if not enable_central_database | bool %}
|
||||
database:
|
||||
image: postgres:{{database_version}}-alpine
|
||||
environment:
|
||||
|
Loading…
Reference in New Issue
Block a user