diff --git a/roles/backup-docker-to-local/tasks/main.yml b/roles/backup-docker-to-local/tasks/main.yml index c61a5f1d..a774f5b4 100644 --- a/roles/backup-docker-to-local/tasks/main.yml +++ b/roles/backup-docker-to-local/tasks/main.yml @@ -46,14 +46,25 @@ state: absent when: mode_reset | bool and run_once_backup_docker_to_local is not defined +- name: Display all database variables + debug: + msg: | + database_instance: "{{ database_instance | default('undefined') }}" + database_name: "{{ database_name | default('undefined') }}" + database_username: "{{ database_username | default('undefined') }}" + database_password: "{{ database_password | default('undefined') }}" + database_host: "{{ database_host | default('undefined') }}" + database_type: "{{ database_type | default('undefined') }}" + when: mode_verbose | bool + - name: seed database values command: cmd: "python database_entry_seeder.py databases.csv {{database_instance}} {{database_name}} {{database_username}} {{database_password}}" chdir: "{{backup_docker_to_local_folder}}" when: > - database_host is defined or - database_name is defined or - database_username is defined or + database_instance is defined and + database_name is defined and + database_username is defined and database_password is defined - name: Set file permissions for databases.csv to be readable, writable, and executable by root only @@ -63,9 +74,9 @@ owner: root group: root when: > - (database_host is defined or - database_name is defined or - database_username is defined or + (database_instance is defined and + database_name is defined and + database_username is defined and database_password is defined) and run_once_backup_docker_to_local_file_permission is not defined register: file_permission_result diff --git a/roles/docker-baserow/tasks/main.yml b/roles/docker-baserow/tasks/main.yml index 0c937ac6..a1cf4908 100644 --- a/roles/docker-baserow/tasks/main.yml +++ b/roles/docker-baserow/tasks/main.yml @@ -5,8 +5,6 @@ - name: "include tasks nginx-docker-proxy-domain.yml" include_tasks: nginx-docker-proxy-domain.yml - - - name: add docker-compose.yml template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml notify: docker compose project setup diff --git a/roles/docker-bigbluebutton/templates/nginx-proxy.conf.j2 b/roles/docker-bigbluebutton/templates/nginx-proxy.conf.j2 index 423ee668..b9cce9c8 100644 --- a/roles/docker-bigbluebutton/templates/nginx-proxy.conf.j2 +++ b/roles/docker-bigbluebutton/templates/nginx-proxy.conf.j2 @@ -1,6 +1,6 @@ server { - # listen 443 ssl http2 default_server; - # listen [::]:443 ssl http2 default_server; + listen 443 ssl http2 default_server; + listen [::]:443 ssl http2 default_server; server_name {{domain}}; ssl_certificate /etc/letsencrypt/live/{{domain}}/fullchain.pem; diff --git a/roles/docker-bigbluebutton/vars/main.yml b/roles/docker-bigbluebutton/vars/main.yml index 71da44f9..c6ec695a 100644 --- a/roles/docker-bigbluebutton/vars/main.yml +++ b/roles/docker-bigbluebutton/vars/main.yml @@ -2,5 +2,4 @@ docker_compose_project_name: "bigbluebutton" #database_host: "postgres" # needs to be fixed #database_name: "greenlight-v3" #database_username: "postgres" -#database_password: "" #database_type: "postgres" \ No newline at end of file diff --git a/roles/docker-gitea/tasks/main.yml b/roles/docker-gitea/tasks/main.yml index 3316509a..82421836 100644 --- a/roles/docker-gitea/tasks/main.yml +++ b/roles/docker-gitea/tasks/main.yml @@ -5,7 +5,6 @@ - name: "include tasks nginx-docker-proxy-domain.yml" include_tasks: nginx-docker-proxy-domain.yml - - name: add docker-compose.yml template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml notify: docker compose project setup diff --git a/roles/docker-gitlab/tasks/main.yml b/roles/docker-gitlab/tasks/main.yml index 3316509a..82421836 100644 --- a/roles/docker-gitlab/tasks/main.yml +++ b/roles/docker-gitlab/tasks/main.yml @@ -5,7 +5,6 @@ - name: "include tasks nginx-docker-proxy-domain.yml" include_tasks: nginx-docker-proxy-domain.yml - - name: add docker-compose.yml template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml notify: docker compose project setup diff --git a/roles/docker-joomla/tasks/main.yml b/roles/docker-joomla/tasks/main.yml index 96e2da10..6cccf7bf 100644 --- a/roles/docker-joomla/tasks/main.yml +++ b/roles/docker-joomla/tasks/main.yml @@ -8,7 +8,6 @@ loop_control: loop_var: domain - - name: add docker-compose.yml template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml notify: docker compose project setup \ No newline at end of file diff --git a/roles/docker-listmonk/tasks/main.yml b/roles/docker-listmonk/tasks/main.yml index aaf046a4..398ef6d5 100644 --- a/roles/docker-listmonk/tasks/main.yml +++ b/roles/docker-listmonk/tasks/main.yml @@ -5,7 +5,6 @@ - name: "include tasks nginx-docker-proxy-domain.yml" include_tasks: nginx-docker-proxy-domain.yml - - name: add docker-compose.yml template: src: "docker-compose.yml.j2" diff --git a/roles/docker-matrix-compose/tasks/main.yml b/roles/docker-matrix-compose/tasks/main.yml index ac86d452..d0e78271 100644 --- a/roles/docker-matrix-compose/tasks/main.yml +++ b/roles/docker-matrix-compose/tasks/main.yml @@ -14,7 +14,6 @@ domain: "{{element_domain}}" http_port: "{{element_http_port}}" - #- name: "create {{docker_compose_instance_directory}}mautrix_whatsapp" # file: # path: "{{docker_compose_instance_directory}}mautrix_whatsapp" diff --git a/roles/docker-nextcloud/tasks/main.yml b/roles/docker-nextcloud/tasks/main.yml index 6bd68082..b6be2cbe 100644 --- a/roles/docker-nextcloud/tasks/main.yml +++ b/roles/docker-nextcloud/tasks/main.yml @@ -17,7 +17,6 @@ dest: "{{path_docker_volumes}}nextcloud/nginx.conf" notify: docker compose project setup - - name: add docker-compose.yml template: src: docker-compose.yml.j2 diff --git a/roles/docker-peertube/tasks/main.yml b/roles/docker-peertube/tasks/main.yml index 091cfe86..7be1dd18 100644 --- a/roles/docker-peertube/tasks/main.yml +++ b/roles/docker-peertube/tasks/main.yml @@ -8,7 +8,6 @@ loop_control: loop_var: domain - - name: copy docker-compose.yml template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml notify: docker compose project setup