Skip to content

Commit d31d48b

Browse files
fix: database name always reverts to default value
1 parent 8b8f7f2 commit d31d48b

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ moodle_db_install: true
7878
# Which database service to use: PostgreSQL (pgsql) or MariaDB (maridb).
7979
moodle_db_type: pgsql
8080

81+
# The name of the database.
82+
moodle_db_name: ""
83+
8184
# If a database service has to be installed, this user will be created with
8285
# administrative provileges on the database. If the database service is already
8386
# running on a different server, the user must supply the username and

vars/main.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,11 @@ moodle_web_protected_files:
124124
- README\.md
125125
- upgrade\.txt
126126

127-
# ------ Set-Up of Database {{{1
128-
129-
# The name of the database.
130-
moodle_db_name: "{{ 'moodle' + moodle_instance }}"
131-
132127
# ------ Install & Server-side Configuration {{{1
133128

134129
# Database connection details.
135130
moodle_cfg_dbtype: "{{ moodle_db_type }}"
136-
moodle_cfg_dbname: "{{ moodle_db_name }}"
131+
moodle_cfg_dbname: "{{ moodle_db_name | default('moodle-' + moodle_instance, true) }}"
137132
moodle_cfg_dbuser: "{{ moodle_db_username }}"
138133
moodle_cfg_dbpass: "{{ moodle_db_password }}"
139134

0 commit comments

Comments
 (0)