implemented database condition

git-subtree-dir: client-playbook
git-subtree-mainline: e763d13570
git-subtree-split: 13f29ce5f7

LICENSE.md

@@ -19,9 +19,9 @@
 
 5. **Consequences of Non-Compliance:** Non-compliance with these license terms may result in legal action, including but not limited to injunctions and claims for damages.
 
-6. **Subsidiary Application of AGPLv3 Terms:** This license agreement constitutes the primary and specific conditions for the use of *"[CyMaIS - Cyber Master Infrastructure Solution](https://cymais.cloud/)"*. In cases where this license agreement does not expressly address certain legal aspects, the terms of the GNU Affero General Public License, Version 3, dated November 19, 2007, shall be applied as secondary, supplementary regulations. This means that the AGPLv3 will only apply in areas not specifically covered by this license, ensuring that all legal aspects are comprehensively regulated. The full text of the AGPLv3 is available at [https://www.gnu.org/licenses/agpl-3.0.de.html](https://www.gnu.org/licenses/agpl-3.0.de.html).
+6. **Disclaimer:** Use of the Software is at your own risk. The Licensor assumes no liability for any damages that may arise from the use of the Software.
 
-7. **Disclaimer:** Use of the Software is at your own risk. The Licensor assumes no liability for any damages that may arise from the use of the Software.
+7. **Ownership of Rights:** All rights, including copyright, trademark, and other forms of intellectual property related to the Software, belong exclusively to Kevin Veen-Birkenbach.
 
 ## Consent
 By using, modifying, or distributing the Software, you agree to these terms.

roles/backup-docker-to-local/tasks/main.yml

@@ -11,15 +11,9 @@
     repo: "https://github.com/kevinveenbirkenbach/backup-docker-to-local.git"
     dest: "{{backup_docker_to_local_folder}}"
     update: yes
-  register: git_result
   ignore_errors: true
   when: run_once_backup_docker_to_local is not defined
 
-- name: Warn if repo is not reachable
-  debug:
-    msg: "Warning: Repository is not reachable."
-  when: git_result is defined and git_result.failed is defined and run_once_cleanup_failed_docker_backups is not defined
-
 - name: configure backup-docker-to-local-everything.service
   template: 
     src: backup-docker-to-local-everything.service.j2

roles/cleanup-failed-docker-backups/tasks/main.yml

@@ -3,15 +3,9 @@
     repo: "https://github.com/kevinveenbirkenbach/cleanup-failed-docker-backups.git"
     dest: "{{backup_docker_to_local_cleanup_folder}}"
     update: yes
-  register: git_result
   ignore_errors: true
   when: run_once_cleanup_failed_docker_backups is not defined
 
-- name: Warn if repo is not reachable
-  debug:
-    msg: "Warning: Repository is not reachable."
-  when: git_result is defined and git_result.failed is defined and run_once_cleanup_failed_docker_backups is not defined
-
 - name: configure cleanup-failed-docker-backups.service
   template: 
     src: cleanup-failed-docker-backups.service.j2

roles/docker-baserow/vars/main.yml

@@ -1,4 +1,3 @@
 docker_compose_project_name:        "baserow"
 database_password:                  "{{ baserow_database_password }}"
-database_version:                   "{{ baserow_database_version | default(postgres_default_version) }}"
 database_type:                      "postgres"

roles/docker-bigbluebutton/tasks/main.yml

@@ -29,14 +29,8 @@
     recursive: yes
     version: main
   notify: setup bigbluebutton
-  register: git_result
   ignore_errors: true
 
-- name: Warn if repo is not reachable
-  debug:
-    msg: "Warning: Repository is not reachable."
-  when: git_result.failed
-
 - name: deploy .env
   template: src=env.j2 dest={{docker_compose_instance_directory}}/.env
   notify: setup bigbluebutton

roles/docker-discourse/README.md

@@ -1,7 +1,5 @@
 # Ansible Role: Docker-Discourse
 
-@TODO Database needs to be decoupled 
-
 This Ansible role sets up Discourse, a popular open-source discussion platform, using Docker containers. It is designed to automate the deployment and configuration process of Discourse, making it easier to maintain and update.
 
 ---

roles/docker-discourse/tasks/main.yml

@@ -1,12 +1,16 @@
 ---
+
+# Necessary for building: https://chat.openai.com/share/99d258cc-294b-4924-8eef-02fe419bb838
+- name: install which
+  pacman:
+    name: which
+    state: present
+
 - name: "include docker-compose-common.yml"
   include_tasks: docker-compose-common.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
-  loop: "{{ domains }}"
-  loop_control:
-    loop_var: domain
 
 - name: "create {{docker_compose_instance_directory}}"
   file:
@@ -14,17 +18,12 @@
     state: directory
     mode: 0755
 
-- name: register directory
-  stat:
-    path: "{{docker_compose_instance_directory}}"
-  register: docker_compose_instance_directory_register
-
 - name: checkout repository 
   ansible.builtin.shell: git checkout .
   become: true
   args:
     chdir: "{{docker_compose_instance_directory}}"
-  when: docker_compose_instance_directory_register.stat.exists
+  ignore_errors: true
 
 - name: pull docker repository
   git:
@@ -33,14 +32,8 @@
     update: yes
   notify: recreate discourse
   become: true
-  register: git_result
   ignore_errors: true
 
-- name: Warn if repo is not reachable
-  debug:
-    msg: "Warning: Repository is not reachable."
-  when: git_result.failed
-
 - name: set chmod 700 for {{docker_compose_instance_directory}}containers
   ansible.builtin.file:
     path: "{{docker_compose_instance_directory}}/containers"

roles/docker-discourse/templates/app.yml.j2

@@ -8,7 +8,9 @@
 ## visit http://www.yamllint.com/ to validate this file as needed
 
 templates:
+{% if not enable_central_database | bool %}
   - "templates/postgres.template.yml"
+{% endif %}
   - "templates/redis.template.yml"
   - "templates/web.template.yml"
   ## Uncomment the next line to enable the IPv6 listener
@@ -77,7 +79,7 @@ env:
   DISCOURSE_DB_PASSWORD: {{ database_password }}
   DISCOURSE_DB_HOST:     {{ database_host }}
   DISCOURSE_DB_NAME:     {{ database_databasename }}
-{% if enable_central_database | bool %}
+{% endif %}
 
   ## If you added the Lets Encrypt template, uncomment below to get a free SSL certificate
   #LETSENCRYPT_ACCOUNT_EMAIL: administrator@veen.world
@@ -123,3 +125,9 @@ run:
   ## After getting the first signup email, re-comment the line. It only needs to run once.
   #- exec: rails r "SiteSetting.notification_email='info@unconfigured.discourse.org'"
   - exec: echo "End of custom commands"
+
+docker_args:
+{% if enable_central_database | bool %}
+  - --network=central_{{ database_type }}_network
+{% endif %}
+  - --name=discourse_application

roles/docker-discourse/vars/main.yml

@@ -1,4 +1,3 @@
-docker_compose_project_name:        "attendize"
+docker_compose_project_name:        "discourse"
 database_password:                  "{{ baserow_database_password }}"
-database_version:                   "{{ baserow_database_version | default(postgres_default_version) }}"
 database_type:                      "postgres"

roles/docker-elk/tasks/main.yml

@@ -26,14 +26,8 @@
     dest: "{{docker_elk_compose_path}}"
     update: yes
   notify: recreate docker-elk
-  register: git_result
   ignore_errors: true
 
-- name: Warn if repo is not reachable
-  debug:
-    msg: "Warning: Repository is not reachable."
-  when: git_result.failed
-
 - name: copy docker-compose.yml
   template: src=docker-compose.yml.j2 dest={{docker_elk_compose_path}}docker-compose.yml
   notify: recreate docker-elk

roles/docker-funkwhale/vars/main.yml

@@ -1,5 +1,4 @@
 docker_compose_project_name:        "funkwhale"
 nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size 512M;"
 database_password:                  "{{funkwhale_database_password}}"
-database_version:                   "{{ funkwhale_database_version | default(postgres_default_version) }}"
 database_type:                      "postgres"

roles/docker-gitlab/README.md

@@ -17,7 +17,6 @@ This Ansible role is designed for setting up and managing a GitLab server runnin
 Variables are defined in `vars/main.yml`. Key variables include:
 - `docker_compose_instance_directory`: Directory for Docker Compose instances.
 - `docker_compose_project_name`, `database_host`, `database_databasename`, `database_username`, `database_password`: Database configuration variables.
-- `database_version`: PostgreSQL version, with a default fallback.
 
 ## Handlers
 - `recreate gitlab`: Restarts GitLab using Docker Compose when changes are detected.

roles/docker-gitlab/vars/main.yml

@@ -1,4 +1,3 @@
 docker_compose_project_name:        "gitlab"
 database_password:                  "{{gitlab_database_password}}"
-database_version:                   "{{ gitlab_database_version | default(postgres_default_version) }}"
 database_type:                      "postgres"

roles/docker-listmonk/vars/main.yml

@@ -1,4 +1,3 @@
 docker_compose_project_name:  	    "listmonk"
 database_password:  	              "{{listmonk_database_password}}"
-database_version:                   "{{ listmonk_database_version | default(postgres_default_version) }}"
 database_type:                      "postgres"

roles/docker-mastodon/vars/main.yml

@@ -1,4 +1,3 @@
 docker_compose_project_name:  	    "mastodon"
 database_password:  	              "{{mastodon_database_password}}"
-database_version:                   "{{ mastodon_database_version | default(postgres_default_version) }}"
 database_type:                      "postgres"

roles/docker-matrix-compose/vars/main.yml

@@ -1,5 +1,4 @@
 ---
 docker_compose_project_name:  	    "matrix"
 database_password:  	              "{{matrix_database_password}}"
-database_version:                   "{{ baserow_database_version | default(postgres_default_version) }}"
 database_type:                      "postgres"

roles/docker-openproject/vars/main.yml

@@ -5,5 +5,4 @@ docker_compose_file_path:           "{{docker_compose_instance_directory}}docker
 docker_compose_backup_path:         "/tmp/{{docker_compose_project_name}}-docker-compose-backup.yml"
 database_password:                  "{{openproject_database_password}}"
 repository_address:                 "https://github.com/opf/openproject-deploy"
-database_version:                   "{{ openproject_database_version | default(postgres_default_version) }}"
 database_type:                      "postgres"

roles/docker-roulette-wheel/tasks/main.yml

@@ -15,14 +15,8 @@
     update: yes
   notify: docker compose project setup
   become: true
-  register: git_result
   ignore_errors: true
 
-- name: Warn if repo is not reachable
-  debug:
-    msg: "Warning: Repository is not reachable."
-  when: git_result.failed
-
 - name: add docker-compose.yml
   template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml
   notify: docker compose project setup

roles/pc-gnome/tasks/main.yml

@@ -19,15 +19,9 @@
     repo: "git@github.com:kevinveenbirkenbach/cli-gnome-extension-manager.git"
     dest: "$HOME/Repositories/github.com/kevinveenbirkenbach/cli-gnome-extension-manager"
     update: yes
-  register: git_result
   ignore_errors: true
   become: false
 
-- name: Warn if repo is not reachable
-  debug:
-    msg: "Warning: Repository is not reachable."
-  when: git_result.failed
-
 - name: Execute CLI GNOME Extension manager script
   ansible.builtin.shell: bash "/home/{{client_username}}/Repositories/github.com/kevinveenbirkenbach/cli-gnome-extension-manager/gnome-extension-manager.sh" "{{ item[0] }}" "{{ item[1] }}" "{{ item[2] }}"
   loop: "{{gnome_extensions}}"

roles/system-swapfile/tasks/main.yml

@@ -3,15 +3,9 @@
     repo: "https://github.com/kevinveenbirkenbach/create-linux-swapfile.git"
     dest: "$HOME/Repositories/github.com/kevinveenbirkenbach/create-linux-swapfile"
     update: yes
-  register: git_result
   ignore_errors: true
   become: false
 
-- name: Warn if repo is not reachable
-  debug:
-    msg: "Warning: Repository is not reachable."
-  when: git_result.failed
-
 - name: Execute create swapfile script
   ansible.builtin.shell: bash "/home/{{client_username}}/Repositories/github.com/kevinveenbirkenbach/create-linux-swapfile/create-linux-swapfile.sh" "{{swapfile_size}}"
   become: true

servers.yml

@@ -196,7 +196,6 @@
    -  role: docker-discourse
       vars:
         domain:   "{{domain_discourse}}"
-        domains:  "{{domains_discourse}}"
         http_port: 8020
 
 - name: setup matrix

tasks/update-repository-with-docker-compose.yml

@@ -5,17 +5,12 @@
     removes: "{{ docker_compose_file_path }}"
   become: true
 
-- name: register directory
-  stat:
-    path: "{{docker_compose_instance_directory}}"
-  register: docker_compose_instance_directory_register
-
 - name: checkout repository 
   ansible.builtin.shell: git checkout .
   become: true
   args:
     chdir: "{{docker_compose_instance_directory}}"
-  when: docker_compose_instance_directory_register.stat.exists
+  ignore_errors: true
 
 - name: pull docker repository
   git:
@@ -24,7 +19,6 @@
     update: yes
   notify: docker compose project setup
   become: true
-  register: git_result
 
 - name: "restore docker-compose.yml from backup"
   command: >
@@ -33,11 +27,6 @@
     removes: "{{ docker_compose_backup_path }}"
   become: true
 
-- name: Warn if repo is not reachable
-  debug:
-    msg: "Warning: Repository is not reachable."
-  when: git_result.failed
-
 - name: "copy docker-compose.yml"
   template: 
     src: docker-compose.yml.j2

vars/docker-database-service.yml.j2

@@ -2,5 +2,5 @@ docker_compose_instance_directory:  "{{ path_docker_compose_instances + docker_c
 database_host:                      "{{ 'central-' + database_type if enable_central_database else 'database' }}"
 database_databasename:              "{{ docker_compose_project_name }}"
 database_username:                  "{{ docker_compose_project_name }}"
-
+database_version:                   "{{ postgres_default_version }}"
 # This will lead to problems with bbb and openproject