Refactor DB Roles

roles/bookstack/defaults/main.yml

@@ -75,10 +75,10 @@ bookstack_docker_envs_default:
   PUID: "{{ uid }}"
   PGID: "{{ gid }}"
   APP_URL: "https://{{ bookstack_web_subdomain + '.' + bookstack_web_domain }}"
-  DB_HOST: "mariadb:3306"
-  DB_USER: root
-  DB_PASS: password321
-  DB_DATABASE: bookstackapp
+  DB_HOST: "{{ bookstack_name }}_mariadb:3306"
+  DB_USER: "{{ mariadb_docker_env_user }}"
+  DB_PASS: "{{ mariadb_docker_env_password }}"
+  DB_DATABASE: "{{ bookstack_name }}"
 bookstack_docker_envs_custom: {}
 bookstack_docker_envs: "{{ bookstack_docker_envs_default
                            | combine(bookstack_docker_envs_custom) }}"

roles/bookstack/tasks/main.yml

@@ -17,14 +17,12 @@
 - name: MariaDB Role
   ansible.builtin.include_role:
     name: mariadb
-
-- name: MariaDB | Create bookstackapp database
-  community.mysql.mysql_db:
-    name: "bookstackapp"
-    login_host: "mariadb"
-    login_user: "root"
-    login_password: "{{ mariadb_docker_env_password }}"
-    state: present
+  vars:
+    mariadb_instances: ["{{ bookstack_name }}_mariadb"]
+    mariadb_docker_env_db: "{{ bookstack_name }}"
+    mariadb_paths_folder: "{{ bookstack_name }}"
+    mariadb_paths_location: "{{ server_appdata_path }}/{{ mariadb_paths_folder }}/mariadb"
+    mariadb_docker_user: ""
 
 - name: Remove existing Docker container
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

roles/docspell/defaults/main.yml

@@ -79,8 +79,8 @@ docspell_docker_envs_default:
   DOCSPELL_SERVER_ADMIN__ENDPOINT_SECRET: "{{ docspell_admin_key.stdout }}"
   # DOCSPELL_SERVER_AUTH_SERVER__SECRET: ""
   DOCSPELL_SERVER_BACKEND_JDBC_PASSWORD: "{{ mariadb_docker_env_password }}"
-  DOCSPELL_SERVER_BACKEND_JDBC_URL: "jdbc:mariadb://{{ docspell_name }}-mariadb:3306/{{ docspell_name }}"
-  DOCSPELL_SERVER_BACKEND_JDBC_USER: "root"
+  DOCSPELL_SERVER_BACKEND_JDBC_URL: "jdbc:mariadb://{{ docspell_name }}_mariadb:3306/{{ docspell_name }}"
+  DOCSPELL_SERVER_BACKEND_JDBC_USER: "{{ mariadb_docker_env_user }}"
   DOCSPELL_SERVER_BIND_ADDRESS: "0.0.0.0"
   DOCSPELL_SERVER_FULL__TEXT__SEARCH_ENABLED: "true"
   DOCSPELL_SERVER_FULL__TEXT__SEARCH_SOLR_URL: "http://{{ docspell_name }}-solr:{{ solr_docker_env_port }}/solr/{{ docspell_name }}"

roles/docspell/tasks/main.yml

@@ -29,8 +29,8 @@
 - name: Create docspell database
   community.mysql.mysql_db:
     name: "{{ docspell_name }}"
-    login_host: "{{ docspell_name }}-mariadb"
-    login_user: "root"
+    login_host: "{{ docspell_name }}_mariadb"
+    login_user: "{{ mariadb_docker_env_user }}"
     login_password: "{{ mariadb_docker_env_password }}"
     state: present
 

roles/factorio/tasks/main.yml

@@ -7,6 +7,15 @@
 #                   GNU General Public License v3.0                     #
 #########################################################################
 ---
+- name: MariaDB Role
+  ansible.builtin.include_role:
+    name: mariadb
+  vars:
+    mariadb_instances: ["{{ wordpress_name }}_mariadb"]
+    mariadb_docker_env_db: "{{ wordpress_name }}"
+    mariadb_paths_folder: "{{ wordpress_name }}"
+    mariadb_paths_location: "{{ server_appdata_path }}/{{ mariadb_paths_folder }}/mariadb"
+
 - name: Add DNS record
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"
   vars:

roles/gitea/defaults/main.yml

@@ -76,10 +76,10 @@ gitea_docker_envs_default:
   USER_UID: "{{ uid }}"
   USER_GID: "{{ gid }}"
   DB_TYPE: "mysql"
-  DB_HOST: "mariadb:3306"
-  DB_USER: "root"
-  DB_PASS: "password321"
-  DB_DATABASE: "gitea"
+  DB_HOST: "{{ gitea_name }}_mariadb:3306"
+  DB_USER: "{{ mariadb_docker_env_user }}"
+  DB_PASS: "{{ mariadb_docker_env_password }}"
+  DB_DATABASE: "{{ gitea_name }}"
   DISABLE_SSH: "true"
   RUN_MODE: "prod"
   ROOT_URL: "{{ gitea_web_url }}/"

roles/gitea/tasks/main.yml

@@ -17,14 +17,11 @@
 - name: MariaDB Role
   ansible.builtin.include_role:
     name: mariadb
-
-- name: MariaDB | Create gitea database
-  community.mysql.mysql_db:
-    name: "gitea"
-    login_host: "mariadb"
-    login_user: "root"
-    login_password: "{{ mariadb_docker_env_password }}"
-    state: present
+  vars:
+    mariadb_instances: ["{{ gitea_name }}_mariadb"]
+    mariadb_docker_env_db: "{{ gitea_name }}"
+    mariadb_paths_folder: "{{ gitea_name }}"
+    mariadb_paths_location: "{{ server_appdata_path }}/{{ mariadb_paths_folder }}/mariadb"
 
 - name: Remove existing Docker container
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

roles/invoiceninjav5/defaults/main.yml

@@ -79,20 +79,20 @@ invoiceninjav5_docker_envs_default:
   REQUIRE_HTTPS: "true"
   DB_STRICT: "false"
   DB_TYPE: "mysql"
-  DB_HOST: "mariadb"
-  DB_USERNAME: "root"
-  DB_PASSWORD: "password321"
-  DB_DATABASE: "invoiceninjav5db"
+  DB_HOST: "{{ invoiceninjav5_name }}_mariadb"
+  DB_USERNAME: "{{ mariadb_docker_env_user }}"
+  DB_PASSWORD: "{{ mariadb_docker_env_password }}"
+  DB_DATABASE: "{{ invoiceninjav5_name }}"
   DB_PORT: "3306"
-  DB_HOST1: "mariadb"
-  DB_USERNAME1: "root"
-  DB_PASSWORD1: "password321"
-  DB_DATABASE1: "invoiceninjav5db"
+  DB_HOST1: "{{ invoiceninjav5_name }}_mariadb"
+  DB_USERNAME1: "{{ mariadb_docker_env_user }}"
+  DB_PASSWORD1: "{{ mariadb_docker_env_password }}"
+  DB_DATABASE1: "{{ invoiceninjav5_name }}"
   DB_PORT1: "3306"
-  MYSQL_ROOT_PASSWORD: "password321"
-  MYSQL_USER: "root"
-  MYSQL_PASSWORD: "password321"
-  MYSQL_DATABASE: "invoiceninjav5db"
+  MYSQL_ROOT_PASSWORD: "{{ mariadb_docker_env_password }}"
+  MYSQL_USER: "{{ mariadb_docker_env_user }}"
+  MYSQL_PASSWORD: "{{ mariadb_docker_env_password }}"
+  MYSQL_DATABASE: "{{ invoiceninjav5_name }}"
   PDF_GENERATOR: "snappdf"
   MULTI_DB_ENABLED: "false"
   IS_DOCKER: "true"

roles/invoiceninjav5/tasks/main.yml

@@ -10,12 +10,18 @@
 - name: MariaDB Role
   ansible.builtin.include_role:
     name: mariadb
+  vars:
+    mariadb_instances: ["{{ invoiceninjav5_name }}_mariadb"]
+    mariadb_docker_env_db: "{{ invoiceninjav5_name }}"
+    mariadb_paths_folder: "{{ invoiceninjav5_name }}"
+    mariadb_paths_location: "{{ server_appdata_path }}/{{ mariadb_paths_folder }}/mariadb"
+    mariadb_docker_user: ""
 
-- name: MariaDB | Create ninja database
+- name: MariaDB | Create invoiceninja database
   community.mysql.mysql_db:
-    name: "invoiceninjav5db"
-    login_host: "mariadb"
-    login_user: "root"
+    name: "{{ invoiceninjav5_name }}"
+    login_host: "{{ invoiceninjav5_name }}_mariadb"
+    login_user: "{{ mariadb_docker_env_user }}"
     login_password: "{{ mariadb_docker_env_password }}"
     state: present
 

roles/koel/defaults/main.yml

@@ -82,7 +82,7 @@ koel_docker_envs_default:
   DB_HOST: "{{ koel_name }}-mariadb"
   DB_PORT: "3306"
   DB_DATABASE: "{{ koel_name }}"
-  DB_USERNAME: "root"
+  DB_USERNAME: "{{ mariadb_docker_env_user }}"
   DB_PASSWORD: "{{ mariadb_docker_env_password }}"
   APP_KEY: "base64:{{ koel_secret_key }}"
   APP_URL: "{{ koel_web_url }}"

roles/koel/tasks/main.yml

@@ -25,14 +25,6 @@
     mariadb_paths_folder: "{{ koel_name }}"
     mariadb_paths_location: "{{ server_appdata_path }}/{{ koel_paths_folder }}/db"
 
-- name: MariaDB | Create koel database
-  community.mysql.mysql_db:
-    name: "koel"
-    login_host: "{{ koel_name }}-mariadb"
-    login_user: "root"
-    login_password: "{{ mariadb_docker_env_password }}"
-    state: present
-
 - name: Check if db folder exists
   ansible.builtin.stat:
     path: "{{ koel_paths_location }}/vars.ini"
@@ -100,9 +92,9 @@
 
 - name: Edit Admin user
   community.mysql.mysql_query:
-    login_db: "koel"
-    login_host: "{{ koel_name }}-mariadb"
-    login_user: "root"
+    login_db: "{{ koel_name }}"
+    login_host: "{{ koel_name }}_mariadb"
+    login_user: "{{ mariadb_docker_env_user }}"
     login_password: "{{ mariadb_docker_env_password }}"
     query: 'UPDATE `users` SET `id` = "1", `name` = "{{ user.name }}", `email` = "{{ user.email }}", `password` = "{{ koel_admin_password_hash.stdout }}", `is_admin` = "1", `preferences` = NULL, `remember_token` = NULL, `created_at` = "{{ koel_date.stdout }}", `updated_at` = "{{ koel_date.stdout }}" WHERE ((`id` = "1"));'
   when: not stat_koel_db_folder.stat.exists

roles/nextcloud/defaults/main.yml

@@ -86,10 +86,10 @@ nextcloud_docker_envs_default:
   NEXTCLOUD_ADMIN_PASSWORD: "{{ user.pass }}"
   NEXTCLOUD_TRUSTED_DOMAINS: "{{ nextcloud_web_subdomain + '.' + nextcloud_web_domain }}"
   NEXTCLOUD_DATA_DIR: "{{ nextcloud_data_directory }}"
-  MYSQL_DATABASE: "nextcloud"
-  MYSQL_USER: "root"
+  MYSQL_DATABASE: "{{ nextcloud_name }}"
+  MYSQL_USER: "{{ mariadb_docker_env_user }}"
   MYSQL_PASSWORD: "{{ mariadb_docker_env_password }}"
-  MYSQL_HOST: "mariadb"
+  MYSQL_HOST: "{{ nextcloud_name }}_mariadb:3306"
   OVERWRITEHOST: "{{ nextcloud_web_subdomain + '.' + nextcloud_web_domain }}"
   OVERWRITEPROTOCOL: "https"
   OVERWRITECLIURL: "https://{{ nextcloud_web_subdomain + '.' + nextcloud_web_domain }}"

roles/nextcloud/tasks/main.yml

@@ -10,6 +10,19 @@
 - name: MariaDB Role
   ansible.builtin.include_role:
     name: mariadb
+  vars:
+    mariadb_instances: ["{{ nextcloud_name }}_mariadb"]
+    mariadb_docker_env_db: "{{ nextcloud_name }}"
+    mariadb_paths_folder: "{{ nextcloud_name }}"
+    mariadb_paths_location: "{{ server_appdata_path }}/{{ mariadb_paths_folder }}/mariadb"
+
+- name: MariaDB | Create invoiceninja database
+  community.mysql.mysql_db:
+    name: "{{ nextcloud_name }}"
+    login_host: "{{ nextcloud_name }}_mariadb"
+    login_user: "{{ mariadb_docker_env_user }}"
+    login_password: "{{ mariadb_docker_env_password }}"
+    state: present
 
 - name: Add DNS record
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"

roles/photoprism/defaults/main.yml

@@ -96,10 +96,10 @@ photoprism_docker_envs_default:
   PHOTOPRISM_DETECT_NSFW: "false"
   PHOTOPRISM_UPLOAD_NSFW: "false"
   PHOTOPRISM_DATABASE_DRIVER: "mysql"
-  PHOTOPRISM_DATABASE_SERVER: "mariadb:3306"
-  PHOTOPRISM_DATABASE_NAME: "photoprisms"
-  PHOTOPRISM_DATABASE_USER: "root"
-  PHOTOPRISM_DATABASE_PASSWORD: "password321"
+  PHOTOPRISM_DATABASE_SERVER: "{{ photoprism_name }}_mariadb"
+  PHOTOPRISM_DATABASE_NAME: "{{ photoprism_name }}"
+  PHOTOPRISM_DATABASE_USER: "{{ mariadb_docker_env_user }}"
+  PHOTOPRISM_DATABASE_PASSWORD: "{{ mariadb_docker_env_password }}"
   PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App"
   PHOTOPRISM_SITE_DESCRIPTION: "Trying out PhotoPrism!"
   PHOTOPRISM_SITE_AUTHOR: "{{ user.name }}"

roles/photoprism/tasks/main.yml

@@ -11,12 +11,17 @@
 - name: MariaDB Role
   ansible.builtin.include_role:
     name: mariadb
+  vars:
+    mariadb_instances: ["{{ photoprism_name }}_mariadb"]
+    mariadb_docker_env_db: "{{ photoprism_name }}"
+    mariadb_paths_folder: "{{ photoprism_name }}"
+    mariadb_paths_location: "{{ server_appdata_path }}/{{ mariadb_paths_folder }}/mariadb"
 
 - name: MariaDB | Create photoprism database
   community.mysql.mysql_db:
-    name: "photoprisms"
-    login_host: "mariadb"
-    login_user: "root"
+    name: "{{ photoprism_name }}"
+    login_host: "{{ photoprism_name }}_mariadb"
+    login_user: "{{ mariadb_docker_env_user }}"
     login_password: "{{ mariadb_docker_env_password }}"
     state: present
   ignore_errors: true

roles/plexshare/tasks/main.yml

@@ -27,15 +27,6 @@
     mariadb_paths_folder: "{{ plexshare_name }}"
     mariadb_paths_location: "{{ server_appdata_path }}/{{ plexshare_paths_folder }}/mariadb"
 
-- name: MariaDB | Create plexshare database
-  community.mysql.mysql_db:
-    name: "plexshare"
-    login_host: "{{ plexshare_name }}-mariadb"
-    login_user: "root"
-    login_password: "{{ mariadb_docker_env_password }}"
-    state: present
-  when: not stat_plexshare_db_folder.stat.exists
-
 - name: Add DNS record
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"
   vars:

roles/rocketchat/tasks/main.yml

@@ -11,8 +11,12 @@
   ansible.builtin.include_role:
     name: mongodb
   vars:
-    mongodb_instances: ["rocketchat_db"]
+    mongodb_instances: ["{{ rocketchat_name }}_mongo"]
     mongodb_docker_commands: "mongod --oplogSize 128 --replSet rs0"
+    mongodb_docker_env_db: "{{ rocketchat_name }}"
+    mongodb_docker_image_tag: "4.4"
+    mongodb_paths_folder: "{{ rocketchat_name }}"
+    mongodb_paths_location: "{{ server_appdata_path }}/{{ mongodb_paths_folder }}/mongodb"
 
 - name: Add DNS record
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"
@@ -39,7 +43,7 @@
   community.docker.docker_container:
     name: "rocketchat-mongo-init-replica"
     image: "mongo:latest"
-    command: 'bash -c "for i in `seq 1 30`; do mongo rocketchat_db/rocketchat --eval \"rs.initiate({ _id: ''rs0'', members: [ { _id: 0, host: ''localhost:27017'' } ]})\" && s=$$? && break || s=$$?; echo \"Tried $$i times. Waiting 5 secs...\"; sleep 5; done; (exit $$s)"'
+    command: 'bash -c "for i in `seq 1 30`; do mongo {{ rocketchat_name }}_mongo/{{ rocketchat_name }} --eval \"rs.initiate({ _id: ''rs0'', members: [ { _id: 0, host: ''localhost:27017'' } ]})\" && s=$$? && break || s=$$?; echo \"Tried $$i times. Waiting 5 secs...\"; sleep 5; done; (exit $$s)"'
     networks:
       - name: saltbox
     comparisons:

roles/stash/tasks/subtasks/auth.yml

@@ -36,5 +36,12 @@
   become: true
   become_user: "{{ user.name }}"
 
+- name: Remove tripwire
+  ansible.builtin.shell: |
+    yyq e -i '.del(.security_tripwire_accessed_from_public_internet)' {{ stash_paths_location }}/config/config.yml
+  become: true
+  become_user: "{{ user.name }}"
+  ignore_errors: yes
+
 - name: Restart Docker container
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/restart_docker_container.yml"

roles/tandoor/defaults/main.yml

@@ -78,11 +78,11 @@ tandoor_docker_envs_default:
   TZ: "{{ tz }}"
   SECRET_KEY: "{{ tandoor.secret_key }}"
   DB_ENGINE: "django.db.backends.postgresql"
-  POSTGRES_HOST: "postgres"
+  POSTGRES_HOST: "{{ tandoor_name }}_postgres"
   POSTGRES_PORT: "5432"
   POSTGRES_USER: "{{ postgres_docker_env_user }}"
   POSTGRES_PASSWORD: "{{ postgres_docker_env_password }}"
-  POSTGRES_DB: "{{ postgres_docker_env_db }}"
+  POSTGRES_DB: "{{ tandoor_name }}"
   DEBUG: "0"
   GUNICORN_MEDIA: "1"
   REMOTE_USER_AUTH: "1"

roles/tandoor/tasks/main.yml

@@ -15,6 +15,12 @@
 - name: PostgreSQL Role
   ansible.builtin.include_role:
     name: postgres
+  vars:
+    postgres_instances: ["{{ tandoor_name }}_postgres"]
+    postgres_docker_env_db: "{{ tandoor_name }}"
+    postgres_docker_image_tag: "14-alpine"
+    postgres_paths_folder: "{{ tandoor_name }}"
+    postgres_paths_location: "{{ server_appdata_path }}/{{ postgres_paths_folder }}/postgres"
 
 - name: Add DNS record
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"

roles/teamspeak/defaults/main.yml

@@ -79,8 +79,8 @@ teamspeak_docker_ports: "{{ lookup('vars', teamspeak_name + '_docker_ports_defau
 teamspeak_docker_envs_default:
   TS3SERVER_DB_PLUGIN: "ts3db_mariadb"
   TS3SERVER_DB_SQLCREATEPATH: "create_mariadb"
-  TS3SERVER_DB_HOST: "mariadb"
-  TS3SERVER_DB_USER: "root"
+  TS3SERVER_DB_HOST: "{{ teamspeak_name }}_mariadb"
+  TS3SERVER_DB_USER: "{{ mariadb_docker_env_user }}"
   TS3SERVER_DB_PASSWORD: "{{ mariadb_docker_env_password }}"
   TS3SERVER_DB_NAME: "{{ teamspeak_name }}"
   TS3SERVER_DB_WAITUNTILREADY: "30"

roles/teamspeak/tasks/main.yml

@@ -13,12 +13,17 @@
 - name: MariaDB Role
   ansible.builtin.include_role:
     name: mariadb
+  vars:
+    mariadb_instances: ["{{ teamspeak_name }}_mariadb"]
+    mariadb_docker_env_db: "{{ teamspeak_name }}"
+    mariadb_paths_folder: "{{ teamspeak_name }}"
+    mariadb_paths_location: "{{ server_appdata_path }}/{{ mariadb_paths_folder }}/mariadb"
 
-- name: MariaDB | Create {{ teamspeak_name }} database
+- name: MariaDB | Create teamspeak database
   community.mysql.mysql_db:
     name: "{{ teamspeak_name }}"
-    login_host: "mariadb"
-    login_user: "root"
+    login_host: "{{ teamspeak_name }}_mariadb"
+    login_user: "{{ mariadb_docker_env_user }}"
     login_password: "{{ mariadb_docker_env_password }}"
     state: present