Skip to content

Commit

Permalink
Use dash instead of underscore for instance names
Browse files Browse the repository at this point in the history
  • Loading branch information
owine committed Sep 22, 2023
1 parent cdcd4aa commit 1f51668
Show file tree
Hide file tree
Showing 34 changed files with 54 additions and 54 deletions.
2 changes: 1 addition & 1 deletion roles/bookstack/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ bookstack_docker_envs_default:
PUID: "{{ uid }}"
PGID: "{{ gid }}"
APP_URL: "https://{{ bookstack_web_subdomain + '.' + bookstack_web_domain }}"
DB_HOST: "{{ bookstack_name }}_mariadb:3306"
DB_HOST: "{{ bookstack_name }}-mariadb:3306"
DB_USER: "{{ mariadb_docker_env_user }}"
DB_PASS: "{{ mariadb_docker_env_password }}"
DB_DATABASE: "{{ bookstack_name }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/bookstack/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
ansible.builtin.include_role:
name: mariadb
vars:
mariadb_instances: ["{{ bookstack_name }}_mariadb"]
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"
Expand Down
2 changes: 1 addition & 1 deletion roles/docspell/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ 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_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"
Expand Down
4 changes: 2 additions & 2 deletions roles/docspell/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
ansible.builtin.include_role:
name: mariadb
vars:
mariadb_instances: ["{{ docspell_name }}_mariadb"]
mariadb_instances: ["{{ docspell_name }}-mariadb"]
mariadb_paths_folder: "{{ docspell_name }}"
mariadb_paths_location: "{{ server_appdata_path }}/{{ docspell_paths_folder }}/mariadb"

Expand Down Expand Up @@ -74,7 +74,7 @@
DOCSPELL_JOEX_FULL__TEXT__SEARCH_ENABLED: "true"
DOCSPELL_JOEX_FULL__TEXT__SEARCH_SOLR_URL: "http://{{ docspell_name }}_solr:{{ solr_docker_env_port }}/solr/{{ docspell_name }}"
DOCSPELL_JOEX_JDBC_PASSWORD: "{{ mariadb_docker_env_password }}"
DOCSPELL_JOEX_JDBC_URL: "jdbc:mariadb://{{ docspell_name }}_mariadb:3306/{{ docspell_name }}"
DOCSPELL_JOEX_JDBC_URL: "jdbc:mariadb://{{ docspell_name }}-mariadb:3306/{{ docspell_name }}"
DOCSPELL_JOEX_JDBC_USER: "root"
DOCSPELL_JOEX_ADDONS_EXECUTOR__CONFIG_RUNNER: "docker,trivial"
DOCSPELL_JOEX_CONVERT_HTML__CONVERTER: "weasyprint"
Expand Down
2 changes: 1 addition & 1 deletion roles/gitea/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ gitea_docker_envs_default:
USER_UID: "{{ uid }}"
USER_GID: "{{ gid }}"
DB_TYPE: "mysql"
DB_HOST: "{{ gitea_name }}_mariadb:3306"
DB_HOST: "{{ gitea_name }}-mariadb:3306"
DB_USER: "{{ mariadb_docker_env_user }}"
DB_PASS: "{{ mariadb_docker_env_password }}"
DB_DATABASE: "{{ gitea_name }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/gitea/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
ansible.builtin.include_role:
name: mariadb
vars:
mariadb_instances: ["{{ gitea_name }}_mariadb"]
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"
Expand Down
4 changes: 2 additions & 2 deletions roles/invoiceninjav5/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ invoiceninjav5_docker_envs_default:
REQUIRE_HTTPS: "true"
DB_STRICT: "false"
DB_TYPE: "mysql"
DB_HOST: "{{ invoiceninjav5_name }}_mariadb"
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: "{{ invoiceninjav5_name }}_mariadb"
DB_HOST1: "{{ invoiceninjav5_name }}-mariadb"
DB_USERNAME1: "{{ mariadb_docker_env_user }}"
DB_PASSWORD1: "{{ mariadb_docker_env_password }}"
DB_DATABASE1: "{{ invoiceninjav5_name }}"
Expand Down
4 changes: 2 additions & 2 deletions roles/invoiceninjav5/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
ansible.builtin.include_role:
name: mariadb
vars:
mariadb_instances: ["{{ invoiceninjav5_name }}_mariadb"]
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"
Expand All @@ -20,7 +20,7 @@
- name: MariaDB | Create invoiceninja database
community.mysql.mysql_db:
name: "{{ invoiceninjav5_name }}"
login_host: "{{ invoiceninjav5_name }}_mariadb"
login_host: "{{ invoiceninjav5_name }}-mariadb"
login_user: "{{ mariadb_docker_env_user }}"
login_password: "{{ mariadb_docker_env_password }}"
state: present
Expand Down
2 changes: 1 addition & 1 deletion roles/joplin/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ joplin_docker_envs_default:
POSTGRES_DATABASE: "joplin"
POSTGRES_USER: "joplin"
POSTGRES_PORT: "5432"
POSTGRES_HOST: "{{ joplin_name }}_postgres"
POSTGRES_HOST: "{{ joplin_name }}-postgres"
DB_CLIENT: "pg"
joplin_docker_envs_custom: {}
joplin_docker_envs: "{{ joplin_docker_envs_default
Expand Down
2 changes: 1 addition & 1 deletion roles/joplin/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
ansible.builtin.include_role:
name: postgres
vars:
postgres_instances: ["{{ joplin_name }}_postgres"]
postgres_instances: ["{{ joplin_name }}-postgres"]
postgres_docker_image_tag: "13"
postgres_docker_env_db: "joplin"
postgres_docker_env_user: "joplin"
Expand Down
2 changes: 1 addition & 1 deletion roles/koel/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ koel_docker_ports: "{{ koel_docker_ports_defaults
koel_docker_envs_default:
TZ: "{{ tz }}"
DB_CONNECTION: "mysql"
DB_HOST: "{{ koel_name }}_mariadb"
DB_HOST: "{{ koel_name }}-mariadb"
DB_PORT: "3306"
DB_DATABASE: "{{ koel_name }}"
DB_USERNAME: "{{ mariadb_docker_env_user }}"
Expand Down
4 changes: 2 additions & 2 deletions roles/koel/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
ansible.builtin.include_role:
name: mariadb
vars:
mariadb_instances: ["{{ koel_name }}_mariadb"]
mariadb_instances: ["{{ koel_name }}-mariadb"]
mariadb_paths_folder: "{{ koel_name }}"
mariadb_paths_location: "{{ server_appdata_path }}/{{ koel_paths_folder }}/db"

Expand Down Expand Up @@ -88,7 +88,7 @@
- name: Edit Admin user
community.mysql.mysql_query:
login_db: "{{ koel_name }}"
login_host: "{{ koel_name }}_mariadb"
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"));'
Expand Down
8 changes: 4 additions & 4 deletions roles/miniflux/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ miniflux_name: miniflux
miniflux_admin_username: "{{ user.name }}"
miniflux_admin_password: "{{ user.pass }}"
miniflux_create_admin: "1"
miniflux_postgres_image_tag: "14-alpine"
miniflux-postgres_image_tag: "14-alpine"
miniflux_run_migrations: "1"

################################
Expand Down Expand Up @@ -82,10 +82,10 @@ miniflux_docker_ports: "{{ miniflux_docker_ports_defaults
+ miniflux_docker_ports_custom }}"

# Envs
miniflux_postgres_username: "{{ lookup('vars', miniflux_name + '_postgres_docker_env_user', default=postgres_docker_env_user) }}"
miniflux_postgres_password: "{{ lookup('vars', miniflux_name + '_postgres_docker_env_password', default=postgres_docker_env_password) }}"
miniflux-postgres_username: "{{ lookup('vars', miniflux_name + '-postgres_docker_env_user', default=postgres_docker_env_user) }}"
miniflux-postgres_password: "{{ lookup('vars', miniflux_name + '-postgres_docker_env_password', default=postgres_docker_env_password) }}"
miniflux_docker_envs_default:
DATABASE_URL: "postgres://{{ miniflux_postgres_username }}:{{ miniflux_postgres_password }}@{{ miniflux_name }}_postgres/miniflux?sslmode=disable"
DATABASE_URL: "postgres://{{ miniflux-postgres_username }}:{{ miniflux-postgres_password }}@{{ miniflux_name }}-postgres/miniflux?sslmode=disable"
RUN_MIGRATIONS: "{{ miniflux_run_migrations }}"
CREATE_ADMIN: "{{ miniflux_create_admin }}"
ADMIN_USERNAME: "{{ miniflux_admin_username }}"
Expand Down
4 changes: 2 additions & 2 deletions roles/miniflux/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
ansible.builtin.include_role:
name: postgres
vars:
postgres_instances: ["{{ miniflux_name }}_postgres"]
postgres_instances: ["{{ miniflux_name }}-postgres"]
postgres_docker_env_db: "miniflux"
postgres_docker_image_tag: "{{ miniflux_postgres_image_tag }}"
postgres_docker_image_tag: "{{ miniflux-postgres_image_tag }}"
postgres_paths_folder: "{{ miniflux_name }}"
postgres_paths_location: "{{ server_appdata_path }}/{{ postgres_paths_folder }}/postgres"

Expand Down
10 changes: 5 additions & 5 deletions roles/n8n/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ n8n_docker_envs_default:
GENERIC_TIMEZONE: "{{ tz }}"
TZ: "{{ tz }}"
DB_TYPE: "postgresdb"
DB_POSTGRESDB_DATABASE: "{{ n8n_name }}"
DB_POSTGRESDB_HOST: "{{ n8n_name }}_postgres"
DB_POSTGRESDB_PORT: "5432"
DB_POSTGRESDB_USER: "{{ postgres_docker_env_user }}"
DB_POSTGRESDB_PASSWORD: "{{ postgres_docker_env_password }}"
DB-postgresDB_DATABASE: "{{ n8n_name }}"
DB-postgresDB_HOST: "{{ n8n_name }}-postgres"
DB-postgresDB_PORT: "5432"
DB-postgresDB_USER: "{{ postgres_docker_env_user }}"
DB-postgresDB_PASSWORD: "{{ postgres_docker_env_password }}"
N8N_EDITOR_BASE_URL: "{{ n8n_web_url }}"
N8N_DIAGNOSTICS_ENABLED: "false"
N8N_HIRING_BANNER_ENABLED: "false"
Expand Down
2 changes: 1 addition & 1 deletion roles/n8n/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
ansible.builtin.include_role:
name: postgres
vars:
postgres_instances: ["{{ n8n_name }}_postgres"]
postgres_instances: ["{{ n8n_name }}-postgres"]
postgres_docker_env_db: "{{ n8n_name }}"
postgres_docker_image_tag: "14-alpine"
postgres_paths_folder: "{{ n8n_name }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/nextcloud/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ nextcloud_docker_envs_default:
MYSQL_DATABASE: "{{ nextcloud_name }}"
MYSQL_USER: "{{ mariadb_docker_env_user }}"
MYSQL_PASSWORD: "{{ mariadb_docker_env_password }}"
MYSQL_HOST: "{{ nextcloud_name }}_mariadb:3306"
MYSQL_HOST: "{{ nextcloud_name }}-mariadb:3306"
OVERWRITEHOST: "{{ nextcloud_web_subdomain + '.' + nextcloud_web_domain }}"
OVERWRITEPROTOCOL: "https"
OVERWRITECLIURL: "https://{{ nextcloud_web_subdomain + '.' + nextcloud_web_domain }}"
Expand Down
4 changes: 2 additions & 2 deletions roles/nextcloud/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
ansible.builtin.include_role:
name: mariadb
vars:
mariadb_instances: ["{{ nextcloud_name }}_mariadb"]
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_host: "{{ nextcloud_name }}-mariadb"
login_user: "{{ mariadb_docker_env_user }}"
login_password: "{{ mariadb_docker_env_password }}"
state: present
Expand Down
4 changes: 2 additions & 2 deletions roles/paperless_ngx/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ paperless_ngx_docker_envs_default:
PAPERLESS_TIME_ZONE: "{{ tz }}"
USERMAP_UID: "{{ uid }}"
USERMAP_GID: "{{ gid }}"
PAPERLESS_REDIS: "redis://{{ paperless_ngx_name }}_redis:6379"
PAPERLESS_DBHOST: "{{ paperless_ngx_name }}_postgres"
PAPERLESS-redis: "redis://{{ paperless_ngx_name }}-redis:6379"
PAPERLESS_DBHOST: "{{ paperless_ngx_name }}-postgres"
PAPERLESS_DBPORT: "5432"
PAPERLESS_DBNAME: "{{ paperless_ngx_name }}"
PAPERLESS_DBPASS: "{{ postgres_docker_env_password }}"
Expand Down
4 changes: 2 additions & 2 deletions roles/paperless_ngx/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
ansible.builtin.include_role:
name: redis
vars:
redis_instances: ["{{ paperless_ngx_name }}_redis"]
redis_instances: ["{{ paperless_ngx_name }}-redis"]
redis_docker_image_tag: "7-alpine"
redis_paths_folder: "{{ paperless_ngx_name }}"
redis_paths_location: "{{ server_appdata_path }}/{{ redis_paths_folder }}/redis"
Expand All @@ -21,7 +21,7 @@
ansible.builtin.include_role:
name: postgres
vars:
postgres_instances: ["{{ paperless_ngx_name }}_postgres"]
postgres_instances: ["{{ paperless_ngx_name }}-postgres"]
postgres_docker_env_db: "{{ paperless_ngx_name }}"
postgres_docker_image_tag: "14-alpine"
postgres_paths_folder: "{{ paperless_ngx_name }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/photoprism/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ photoprism_docker_envs_default:
PHOTOPRISM_DETECT_NSFW: "false"
PHOTOPRISM_UPLOAD_NSFW: "false"
PHOTOPRISM_DATABASE_DRIVER: "mysql"
PHOTOPRISM_DATABASE_SERVER: "{{ photoprism_name }}_mariadb"
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 }}"
Expand Down
4 changes: 2 additions & 2 deletions roles/photoprism/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
ansible.builtin.include_role:
name: mariadb
vars:
mariadb_instances: ["{{ photoprism_name }}_mariadb"]
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: "{{ photoprism_name }}"
login_host: "{{ photoprism_name }}_mariadb"
login_host: "{{ photoprism_name }}-mariadb"
login_user: "{{ mariadb_docker_env_user }}"
login_password: "{{ mariadb_docker_env_password }}"
state: present
Expand Down
2 changes: 1 addition & 1 deletion roles/plexshare/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
ansible.builtin.include_role:
name: mariadb
vars:
mariadb_instances: ["{{ plexshare_name }}_mariadb"]
mariadb_instances: ["{{ plexshare_name }}-mariadb"]
mariadb_docker_image_tag: "latest"
mariadb_paths_folder: "{{ plexshare_name }}"
mariadb_paths_location: "{{ server_appdata_path }}/{{ plexshare_paths_folder }}/mariadb"
Expand Down
4 changes: 2 additions & 2 deletions roles/rocketchat/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
ansible.builtin.include_role:
name: mongodb
vars:
mongodb_instances: ["{{ rocketchat_name }}_mongo"]
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"
Expand Down Expand Up @@ -43,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_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)"'
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:
Expand Down
2 changes: 1 addition & 1 deletion roles/tandoor/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ tandoor_docker_envs_default:
TZ: "{{ tz }}"
SECRET_KEY: "{{ tandoor.secret_key }}"
DB_ENGINE: "django.db.backends.postgresql"
POSTGRES_HOST: "{{ tandoor_name }}_postgres"
POSTGRES_HOST: "{{ tandoor_name }}-postgres"
POSTGRES_PORT: "5432"
POSTGRES_USER: "{{ postgres_docker_env_user }}"
POSTGRES_PASSWORD: "{{ postgres_docker_env_password }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/tandoor/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
ansible.builtin.include_role:
name: postgres
vars:
postgres_instances: ["{{ tandoor_name }}_postgres"]
postgres_instances: ["{{ tandoor_name }}-postgres"]
postgres_docker_env_db: "{{ tandoor_name }}"
postgres_docker_image_tag: "14-alpine"
postgres_paths_folder: "{{ tandoor_name }}"
Expand Down
6 changes: 3 additions & 3 deletions roles/teamspeak/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ teamspeak_docker_ports: "{{ lookup('vars', teamspeak_name + '_docker_ports_defau

# Envs
teamspeak_docker_envs_default:
TS3SERVER_DB_PLUGIN: "ts3db_mariadb"
TS3SERVER_DB_SQLCREATEPATH: "create_mariadb"
TS3SERVER_DB_HOST: "{{ teamspeak_name }}_mariadb"
TS3SERVER_DB_PLUGIN: "ts3db-mariadb"
TS3SERVER_DB_SQLCREATEPATH: "create-mariadb"
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 }}"
Expand Down
4 changes: 2 additions & 2 deletions roles/teamspeak/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
ansible.builtin.include_role:
name: mariadb
vars:
mariadb_instances: ["{{ teamspeak_name }}_mariadb"]
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 database
community.mysql.mysql_db:
name: "{{ teamspeak_name }}"
login_host: "{{ teamspeak_name }}_mariadb"
login_host: "{{ teamspeak_name }}-mariadb"
login_user: "{{ mariadb_docker_env_user }}"
login_password: "{{ mariadb_docker_env_password }}"
state: present
Expand Down
2 changes: 1 addition & 1 deletion roles/tubearchivist/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ tubearchivist_docker_ports: "{{ tubearchivist_docker_ports_defaults
tubearchivist_docker_envs_default:
TZ: "{{ tz }}"
ES_URL: "http://{{ tubearchivist_name }}_elasticsearch:9200"
REDIS_HOST: "{{ tubearchivist_name }}_redis"
REDIS_HOST: "{{ tubearchivist_name }}-redis"
HOST_UID: "{{ uid }}"
HOST_GID: "{{ gid }}"
TA_HOST: "localhost 127.0.0.1 {{ tubearchivist_name }} {{ tubearchivist_web_subdomain + '.' + tubearchivist_web_domain }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/tubearchivist/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
ansible.builtin.include_role:
name: redis
vars:
redis_instances: ["{{ tubearchivist_name }}_redis"]
redis_instances: ["{{ tubearchivist_name }}-redis"]
redis_docker_image_tag: "latest"
redis_docker_image: "redislabs/rejson"
redis_paths_folder: "{{ tubearchivist_name }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/wikijs/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ wikijs_docker_ports: "{{ wikijs_docker_ports_defaults
wikijs_docker_envs_default:
TZ: "{{ tz }}"
DB_TYPE: "postgres"
DB_HOST: "{{ wikijs_name }}_postgres"
DB_HOST: "{{ wikijs_name }}-postgres"
DB_PORT: "5432"
DB_USER: "{{ postgres_docker_env_user }}"
DB_PASS: "{{ postgres_docker_env_password }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/wikijs/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
ansible.builtin.include_role:
name: postgres
vars:
postgres_instances: ["{{ wikijs_name }}_postgres"]
postgres_instances: ["{{ wikijs_name }}-postgres"]
postgres_docker_env_db: "{{ wikijs_name }}"
postgres_docker_image_tag: "14-alpine"
postgres_paths_folder: "{{ wikijs_name }}"
Expand Down
Loading

0 comments on commit 1f51668

Please sign in to comment.