From 1e2027a97adb7481c7cb296330039313fefd95c6 Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Mon, 4 Jul 2016 10:43:48 -0400 Subject: Bug 1284263 - Add optional support for $DATABASE_URL instead of localconfig for db_* connection params. --- template/en/default/global/user-error.html.tmpl | 6 +++++- template/en/default/setup/strings.txt.pl | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'template/en') diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index dd6c71539..fa5af632c 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -566,7 +566,7 @@ [% ELSIF error == "feature_disabled" %] The [% feature_description(feature) FILTER html %] feature is not available in this Bugzilla. - [% IF user.in_group('admin') %] + [% IF user.in_group('admin') || Bugzilla.usage_mode != constants.USAGE_MODE_BROWSER %] If you would like to enable this feature, please run cpanm -l local --installdeps --with-feature [% feature FILTER html %] "." [% END %] @@ -1350,6 +1350,10 @@ the results of your last search. I'm afraid you will have to start again from the search page. + [% ELSIF error == "missing_database_url" %] + [% title = "Missing \$DATABASE_URL" %] + $DATABASE_URL must be defined when localconfig "db_from_env" option is enabled. + [% ELSIF error == "missing_datasets" %] [% title = "No Datasets Selected" %] [% docslinks = {'using/reports-and-charts.html' => 'Reporting'} %] 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 @@ -128,6 +128,11 @@ Should checksetup.pl try to verify that your database setup is correct? 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 -- cgit v1.2.3-24-g4f1b