summaryrefslogtreecommitdiffstats
path: root/template/en/default/setup
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2016-07-04 16:43:48 +0200
committerDylan William Hardison <dylan@hardison.net>2016-09-10 18:40:58 +0200
commit1e2027a97adb7481c7cb296330039313fefd95c6 (patch)
treef8f900af1e38e4020c8580c58cd3e2faa54a6569 /template/en/default/setup
parentc61b7ce75f229d4034099e8e93c56d98208bc799 (diff)
downloadbugzilla-1e2027a97adb7481c7cb296330039313fefd95c6.tar.gz
bugzilla-1e2027a97adb7481c7cb296330039313fefd95c6.tar.xz
Bug 1284263 - Add optional support for $DATABASE_URL instead of localconfig for db_* connection params.
Diffstat (limited to 'template/en/default/setup')
-rw-r--r--template/en/default/setup/strings.txt.pl5
1 files changed, 5 insertions, 0 deletions
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index 3adb06b85..34bbba2b7 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -129,6 +129,11 @@ With some combinations of database servers/Perl modules/moonphase this
doesn't work, and so you can try setting this to 0 to make checksetup.pl
run.
END
+ localconfig_db_from_env => <<'END',
+If this is set, the other db_* values will be ignored and instead the $DATABASE_URL
+will be used to provide the database connection information.
+Note this requires the 'db_from_env' feature to be enabled.
+END
localconfig_db_driver => <<'END',
What SQL database to use. Default is mysql. List of supported databases
can be obtained by listing Bugzilla/DB directory - every module corresponds