Renamed databasename

This commit is contained in:
Kevin Veen-Birkenbach 2024-01-06 14:32:49 +01:00
parent 68613545b2
commit 7d8b7dd00f
27 changed files with 39 additions and 39 deletions

View File

@ -49,11 +49,11 @@
- name: seed database values - name: seed database values
command: command:
cmd: "python database_entry_seeder.py databases.csv {{database_instance}} {{database_databasename}} {{database_username}} {{database_password}}" cmd: "python database_entry_seeder.py databases.csv {{database_instance}} {{database_name}} {{database_username}} {{database_password}}"
chdir: "{{backup_docker_to_local_folder}}" chdir: "{{backup_docker_to_local_folder}}"
when: > when: >
database_host is defined or database_host is defined or
database_databasename is defined or database_name is defined or
database_username is defined or database_username is defined or
database_password is defined database_password is defined
@ -65,7 +65,7 @@
group: root group: root
when: > when: >
(database_host is defined or (database_host is defined or
database_databasename is defined or database_name is defined or
database_username is defined or database_username is defined or
database_password is defined) and database_password is defined) and
run_once_backup_docker_to_local_file_permission is not defined run_once_backup_docker_to_local_file_permission is not defined

View File

@ -6,7 +6,7 @@ LOCALE=en-US
DB_HOST={{database_host}} DB_HOST={{database_host}}
# Change these to match env/db.env # Change these to match env/db.env
DB_DATABASE={{database_databasename}} DB_DATABASE={{database_name}}
DB_USERNAME={{database_username}} DB_USERNAME={{database_username}}
DB_PASSWORD={{database_password}} DB_PASSWORD={{database_password}}

View File

@ -10,7 +10,7 @@ EMAIL_SMTP_PASSWORD={{ system_email_password }}
EMAIL_SMTP_USE_TLS={{ system_email_tls | upper }} EMAIL_SMTP_USE_TLS={{ system_email_tls | upper }}
DATABASE_USER={{ database_username }} DATABASE_USER={{ database_username }}
DATABASE_NAME={{ database_databasename }} DATABASE_NAME={{ database_name }}
DATABASE_HOST={{ database_host }} DATABASE_HOST={{ database_host }}
DATABASE_PORT=5432 DATABASE_PORT=5432
DATABASE_PASSWORD={{ database_password }} DATABASE_PASSWORD={{ database_password }}

View File

@ -1,6 +1,6 @@
docker_compose_project_name: "bigbluebutton" docker_compose_project_name: "bigbluebutton"
database_host: "postgres" # needs to be fixed database_host: "postgres" # needs to be fixed
database_databasename: "greenlight-v3" database_name: "greenlight-v3"
database_username: "postgres" database_username: "postgres"
database_password: "" database_password: ""
database_type: "postgres" database_type: "postgres"

View File

@ -67,7 +67,7 @@ env:
DISCOURSE_DB_USERNAME: {{ database_username }} DISCOURSE_DB_USERNAME: {{ database_username }}
DISCOURSE_DB_PASSWORD: {{ database_password }} DISCOURSE_DB_PASSWORD: {{ database_password }}
DISCOURSE_DB_HOST: {{ database_host }} DISCOURSE_DB_HOST: {{ database_host }}
DISCOURSE_DB_NAME: {{ database_databasename }} DISCOURSE_DB_NAME: {{ database_name }}
# Redis Configuration # Redis Configuration
DISCOURSE_REDIS_HOST: {{docker_compose_project_name}}-redis DISCOURSE_REDIS_HOST: {{docker_compose_project_name}}-redis

View File

@ -14,7 +14,7 @@ services:
- USER_GID=1000 - USER_GID=1000
- DB_TYPE=mysql - DB_TYPE=mysql
- DB_HOST={{database_host}}:3306 - DB_HOST={{database_host}}:3306
- DB_NAME={{database_databasename}} - DB_NAME={{database_name}}
- DB_USER={{database_username}} - DB_USER={{database_username}}
- DB_PASSWD={{database_password}} - DB_PASSWD={{database_password}}
- SSH_PORT={{ssh_port}} - SSH_PORT={{ssh_port}}

View File

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

View File

@ -20,7 +20,7 @@ services:
gitlab_rails['db_port'] = 5432 gitlab_rails['db_port'] = 5432
gitlab_rails['db_username'] = '{{database_username}}' gitlab_rails['db_username'] = '{{database_username}}'
gitlab_rails['db_password'] = '{{database_password}}' gitlab_rails['db_password'] = '{{database_password}}'
gitlab_rails['db_database'] = "{{database_databasename}}" gitlab_rails['db_database'] = "{{database_name}}"
nginx['listen_port'] = 80 nginx['listen_port'] = 80
nginx['listen_https'] = false nginx['listen_https'] = false

View File

@ -12,7 +12,7 @@ services:
JOOMLA_DB_HOST: "{{database_host}}:3306" JOOMLA_DB_HOST: "{{database_host}}:3306"
JOOMLA_DB_USER: "{{database_username}}" JOOMLA_DB_USER: "{{database_username}}"
JOOMLA_DB_PASSWORD: "{{database_password}}" JOOMLA_DB_PASSWORD: "{{database_password}}"
JOOMLA_DB_NAME: "{{database_databasename}}" JOOMLA_DB_NAME: "{{database_name}}"
restart: always restart: always
volumes: volumes:
- data:/var/www/html - data:/var/www/html

View File

@ -20,7 +20,7 @@ user = "{{database_username}}"
password = "{{database_password}}" password = "{{database_password}}"
# Ensure that this database has been created in Postgres. # Ensure that this database has been created in Postgres.
database = "{{database_databasename}}" database = "{{database_name}}"
ssl_mode = "disable" ssl_mode = "disable"
max_open = 25 max_open = 25

View File

@ -143,11 +143,11 @@ DB_FLAVOR=mysql
DB_USER={{database_username}} DB_USER={{database_username}}
DB_PW={{database_password}} DB_PW={{database_password}}
DB_HOST={{database_host}}:3306 DB_HOST={{database_host}}:3306
DB_NAME={{database_databasename}} DB_NAME={{database_name}}
ROUNDCUBE_DB_FLAVOR=mysql ROUNDCUBE_DB_FLAVOR=mysql
ROUNDCUBE_DB_USER={{database_username}} ROUNDCUBE_DB_USER={{database_username}}
ROUNDCUBE_DB_PW={{database_password}} ROUNDCUBE_DB_PW={{database_password}}
ROUNDCUBE_DB_NAME={{database_databasename}} ROUNDCUBE_DB_NAME={{database_name}}
ROUNDCUBE_DB_HOST={{database_host}}:3306 ROUNDCUBE_DB_HOST={{database_host}}:3306

View File

@ -19,7 +19,7 @@ Before using this role, ensure you have the following:
## Configuration ## Configuration
Configure the role by setting the required variables. These can be set in the playbook or in a separate variable file: Configure the role by setting the required variables. These can be set in the playbook or in a separate variable file:
- `central_mariadb_root_password`: The root password for the MariaDB server. - `central_mariadb_root_password`: The root password for the MariaDB server.
- `database_databasename`: The name of the initial database to create. - `database_name`: The name of the initial database to create.
- `database_username`: The username for the database user. - `database_username`: The username for the database user.
- `database_password`: The password for the database user. - `database_password`: The password for the database user.

View File

@ -46,9 +46,9 @@
timeout: 300 timeout: 300
when: run_once_docker_mariadb is not defined when: run_once_docker_mariadb is not defined
- name: "Create database: {{ database_databasename }}" - name: "Create database: {{ database_name }}"
mysql_db: mysql_db:
name: "{{ database_databasename }}" name: "{{ database_name }}"
state: present state: present
login_user: root login_user: root
login_password: "{{ central_mariadb_root_password }}" login_password: "{{ central_mariadb_root_password }}"
@ -60,7 +60,7 @@
name: "{{database_username}}" name: "{{database_username}}"
password: "{{database_password}}" password: "{{database_password}}"
host: "%" host: "%"
priv: '{{database_databasename}}.*:ALL' priv: '{{database_name}}.*:ALL'
state: present state: present
login_user: root login_user: root
login_password: "{{central_mariadb_root_password}}" login_password: "{{central_mariadb_root_password}}"

View File

@ -8,7 +8,7 @@ VAPID_PUBLIC_KEY={{mastodon_vapid_public_key}}
DB_HOST={{database_host}} DB_HOST={{database_host}}
DB_PORT=5432 DB_PORT=5432
DB_NAME={{database_databasename}} DB_NAME={{database_name}}
DB_USER={{database_username}} DB_USER={{database_username}}
DB_PASS={{database_password}} DB_PASS={{database_password}}

View File

@ -16,7 +16,7 @@ services:
MATOMO_DATABASE_ADAPTER: "mysql" MATOMO_DATABASE_ADAPTER: "mysql"
MATOMO_DATABASE_USERNAME: "{{database_username}}" MATOMO_DATABASE_USERNAME: "{{database_username}}"
MATOMO_DATABASE_PASSWORD: "{{database_password}}" MATOMO_DATABASE_PASSWORD: "{{database_password}}"
MATOMO_DATABASE_DBNAME: "{{database_databasename}}" MATOMO_DATABASE_DBNAME: "{{database_name}}"
volumes: volumes:
- data:/var/www/html - data:/var/www/html
{% include 'templates/docker-container-depends-on-just-database.yml.j2' %} {% include 'templates/docker-container-depends-on-just-database.yml.j2' %}

View File

@ -13,7 +13,7 @@ database:
args: args:
user: "{{database_username}}" user: "{{database_username}}"
password: "{{database_password}}" password: "{{database_password}}"
database: "{{database_databasename}}" database: "{{database_name}}"
host: "{{database_host}}" host: "{{database_host}}"
cp_min: 5 cp_min: 5
cp_max: 10 cp_max: 10

View File

@ -14,7 +14,7 @@ services:
volumes: volumes:
- data:/var/www/html - data:/var/www/html
environment: environment:
MYSQL_DATABASE: "{{database_databasename}}" MYSQL_DATABASE: "{{database_name}}"
MYSQL_USER: "{{database_username}}" MYSQL_USER: "{{database_username}}"
MYSQL_PASSWORD: "{{database_password}}" MYSQL_PASSWORD: "{{database_password}}"
MYSQL_HOST: {{database_host}}:3306 MYSQL_HOST: {{database_host}}:3306

View File

@ -13,6 +13,6 @@ PORT=127.0.0.1:{{http_port}}
OPENPROJECT_RAILS__RELATIVE__URL__ROOT= OPENPROJECT_RAILS__RELATIVE__URL__ROOT=
IMAP_ENABLED=false IMAP_ENABLED=false
POSTGRES_PASSWORD="{{ database_password }}" POSTGRES_PASSWORD="{{ database_password }}"
DATABASE_URL="postgres://{{ database_username }}:{{ database_password }}@{{database_host}}/{{database_databasename}}?pool=20&encoding=unicode&reconnect=true" DATABASE_URL="postgres://{{ database_username }}:{{ database_password }}@{{database_host}}/{{database_name}}?pool=20&encoding=unicode&reconnect=true"
RAILS_MIN_THREADS=4 RAILS_MIN_THREADS=4
RAILS_MAX_THREADS=16 RAILS_MAX_THREADS=16

View File

@ -1,7 +1,7 @@
# Database / Postgres service configuration # Database / Postgres service configuration
POSTGRES_USER={{database_username}} POSTGRES_USER={{database_username}}
POSTGRES_PASSWORD={{peertube_database_password}} POSTGRES_PASSWORD={{peertube_database_password}}
POSTGRES_DB={{database_databasename}} POSTGRES_DB={{database_name}}
PEERTUBE_DB_USERNAME={{database_username}} PEERTUBE_DB_USERNAME={{database_username}}
PEERTUBE_DB_PASSWORD={{peertube_database_password}} PEERTUBE_DB_PASSWORD={{peertube_database_password}}
PEERTUBE_DB_SSL=false PEERTUBE_DB_SSL=false

View File

@ -56,7 +56,7 @@ MAIL_ENCRYPTION=tls
## Databases (MySQL) ## Databases (MySQL)
DB_CONNECTION=mysql DB_CONNECTION=mysql
DB_DATABASE={{database_databasename}} DB_DATABASE={{database_name}}
DB_HOST={{database_host}} DB_HOST={{database_host}}
DB_PASSWORD="{{pixelfed_database_password}}" DB_PASSWORD="{{pixelfed_database_password}}"
DB_PORT=3306 DB_PORT=3306

View File

@ -5,7 +5,7 @@ This Ansible role is designed to deploy a PostgreSQL database using Docker. It i
## Role Variables ## Role Variables
- `central_postgres_password`: The password for the PostgreSQL superuser (`postgres`). - `central_postgres_password`: The password for the PostgreSQL superuser (`postgres`).
- `database_databasename`: Name of the database to be created. - `database_name`: Name of the database to be created.
- `database_username`: Username for the database user. - `database_username`: Username for the database user.
- `database_password`: Password for the database user. - `database_password`: Password for the database user.

View File

@ -41,9 +41,9 @@
state: present state: present
when: run_once_docker_postgres is not defined when: run_once_docker_postgres is not defined
- name: "Create database: {{ database_databasename }}" - name: "Create database: {{ database_name }}"
postgresql_db: postgresql_db:
name: "{{ database_databasename }}" name: "{{ database_name }}"
state: present state: present
login_user: postgres login_user: postgres
login_password: "{{ central_postgres_password }}" login_password: "{{ central_postgres_password }}"
@ -54,7 +54,7 @@
postgresql_user: postgresql_user:
name: "{{ database_username }}" name: "{{ database_username }}"
password: "{{ database_password }}" password: "{{ database_password }}"
db: "{{ database_databasename }}" db: "{{ database_name }}"
state: present state: present
login_user: postgres login_user: postgres
login_password: "{{ central_postgres_password }}" login_password: "{{ central_postgres_password }}"
@ -63,7 +63,7 @@
- name: "Set privileges for database user: {{ database_username }}" - name: "Set privileges for database user: {{ database_username }}"
postgresql_privs: postgresql_privs:
db: "{{ database_databasename }}" db: "{{ database_name }}"
role: "{{ database_username }}" role: "{{ database_username }}"
objs: ALL_IN_SCHEMA objs: ALL_IN_SCHEMA
privs: ALL privs: ALL
@ -76,7 +76,7 @@
- name: Grant all privileges at the database level - name: Grant all privileges at the database level
postgresql_privs: postgresql_privs:
db: "{{ database_databasename }}" db: "{{ database_name }}"
role: "{{ database_username }}" role: "{{ database_username }}"
privs: ALL privs: ALL
type: database type: database
@ -88,7 +88,7 @@
- name: Grant all privileges on all tables in the public schema - name: Grant all privileges on all tables in the public schema
postgresql_privs: postgresql_privs:
db: "{{ database_databasename }}" db: "{{ database_name }}"
role: "{{ database_username }}" role: "{{ database_username }}"
objs: ALL_IN_SCHEMA objs: ALL_IN_SCHEMA
privs: ALL privs: ALL
@ -102,7 +102,7 @@
- name: Set comprehensive privileges for user on public schema - name: Set comprehensive privileges for user on public schema
postgresql_query: postgresql_query:
db: "{{ database_databasename }}" db: "{{ database_name }}"
login_user: postgres login_user: postgres
login_password: "{{ central_postgres_password }}" login_password: "{{ central_postgres_password }}"
login_host: 127.0.0.1 login_host: 127.0.0.1

View File

@ -14,7 +14,7 @@ services:
WORDPRESS_DB_HOST: "{{database_host}}:3306" WORDPRESS_DB_HOST: "{{database_host}}:3306"
WORDPRESS_DB_USER: "{{database_username}}" WORDPRESS_DB_USER: "{{database_username}}"
WORDPRESS_DB_PASSWORD: "{{database_password}}" WORDPRESS_DB_PASSWORD: "{{database_password}}"
WORDPRESS_DB_NAME: "{{database_databasename}}" WORDPRESS_DB_NAME: "{{database_name}}"
volumes: volumes:
- data:/var/www/html - data:/var/www/html
healthcheck: healthcheck:

View File

@ -15,7 +15,7 @@ services:
YOURLS_DB_HOST: "{{database_host}}" YOURLS_DB_HOST: "{{database_host}}"
YOURLS_DB_USER: "{{database_username}}" YOURLS_DB_USER: "{{database_username}}"
YOURLS_DB_PASS: "{{database_password}}" YOURLS_DB_PASS: "{{database_password}}"
YOURLS_DB_NAME: "{{database_databasename}}" YOURLS_DB_NAME: "{{database_name}}"
YOURLS_SITE: "https://{{domain}}" YOURLS_SITE: "https://{{domain}}"
YOURLS_USER: "{{yourls_user}}" YOURLS_USER: "{{yourls_user}}"
YOURLS_PASS: "{{yourls_user_password}}" YOURLS_PASS: "{{yourls_user_password}}"

View File

@ -7,7 +7,7 @@
image: mariadb image: mariadb
restart: always restart: always
environment: environment:
MYSQL_DATABASE: "{{database_databasename}}" MYSQL_DATABASE: "{{database_name}}"
MYSQL_USER: "{{database_username}}" MYSQL_USER: "{{database_username}}"
MYSQL_PASSWORD: "{{database_password}}" MYSQL_PASSWORD: "{{database_password}}"
MYSQL_ROOT_PASSWORD: "{{database_password}}" MYSQL_ROOT_PASSWORD: "{{database_password}}"

View File

@ -6,11 +6,11 @@
environment: environment:
- POSTGRES_PASSWORD={{database_password}} - POSTGRES_PASSWORD={{database_password}}
- POSTGRES_USER={{database_username}} - POSTGRES_USER={{database_username}}
- POSTGRES_DB={{database_databasename}} - POSTGRES_DB={{database_name}}
- POSTGRES_INITDB_ARGS="--encoding=UTF8 --locale=C" - POSTGRES_INITDB_ARGS="--encoding=UTF8 --locale=C"
restart: always restart: always
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U {{database_databasename}}"] test: ["CMD-SHELL", "pg_isready -U {{database_name}}"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 6 retries: 6

View File

@ -1,6 +1,6 @@
docker_compose_instance_directory: "{{ path_docker_compose_instances + docker_compose_project_name + '/' }}" docker_compose_instance_directory: "{{ path_docker_compose_instances + docker_compose_project_name + '/' }}"
database_instance: "{{ 'central-' + database_type if enable_central_database else docker_compose_project_name }}" database_instance: "{{ 'central-' + database_type if enable_central_database else docker_compose_project_name }}"
database_host: "{{ 'central-' + database_type if enable_central_database else 'database' }}" database_host: "{{ 'central-' + database_type if enable_central_database else 'database' }}"
database_databasename: "{{ docker_compose_project_name }}" database_name: "{{ docker_compose_project_name }}"
database_username: "{{ docker_compose_project_name }}" database_username: "{{ docker_compose_project_name }}"
database_version: "{{ postgres_default_version }}" database_version: "{{ postgres_default_version }}"