From 616831b6c6d05283cef53211d4cf6800c20325e7 Mon Sep 17 00:00:00 2001 From: Mary Umoh Date: Wed, 5 Jul 2017 20:42:01 -0400 Subject: Bug 1377807 - Move memcached options from data/params to localconfig --- .../en/default/admin/params/memcached.html.tmpl | 22 ---------------------- template/en/default/setup/strings.txt.pl | 8 ++++++++ 2 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 template/en/default/admin/params/memcached.html.tmpl (limited to 'template') diff --git a/template/en/default/admin/params/memcached.html.tmpl b/template/en/default/admin/params/memcached.html.tmpl deleted file mode 100644 index eef39860a..000000000 --- a/template/en/default/admin/params/memcached.html.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -[%# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - # This Source Code Form is "Incompatible With Secondary Licenses", as - # defined by the Mozilla Public License, v. 2.0. - #%] -[% - title = "Memcached" - desc = "Set up Memcached integration" -%] - -[% param_descs = { - memcached_servers => - "If this option is set, $terms.Bugzilla will integrate with Memcached. " _ - "Specify one of more server, separated by spaces, using hostname:port " _ - "notation (for example: 127.0.0.1:11211).", - - memcached_namespace => - "Specify a string to prefix to each key on Memcached.", - } -%] diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl index 8afb4a2e4..2e1a18f00 100644 --- a/template/en/default/setup/strings.txt.pl +++ b/template/en/default/setup/strings.txt.pl @@ -177,6 +177,14 @@ END If you want to use the "Difference Between Two Patches" feature of the Patch Viewer, please specify the full path to the "interdiff" executable here. +END + localconfig_memcached_servers => <<'END', +If this option is set, Bugzilla will integrate with Memcached. +Specify one or more servers, separated by spaces, using hostname:port +notation (for example: 127.0.0.1:11211). +END + localconfig_memcached_namespace => <<'END', +Specify a string to prefix each key on Memcached. END localconfig_site_wide_secret => <<'END', This secret key is used by your installation for the creation and -- cgit v1.2.3-24-g4f1b