summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorMary Umoh <umohm12@gmail.com>2017-07-06 02:42:01 +0200
committerDylan William Hardison <dylan@hardison.net>2017-07-07 00:19:34 +0200
commit616831b6c6d05283cef53211d4cf6800c20325e7 (patch)
treedfd7ce2c990dcb18add29c9d61d43c565ef8db60 /template
parent6f06744ccc95232300ee53ead82166e60c84351c (diff)
downloadbugzilla-616831b6c6d05283cef53211d4cf6800c20325e7.tar.gz
bugzilla-616831b6c6d05283cef53211d4cf6800c20325e7.tar.xz
Bug 1377807 - Move memcached options from data/params to localconfig
Diffstat (limited to 'template')
-rw-r--r--template/en/default/admin/params/memcached.html.tmpl22
-rw-r--r--template/en/default/setup/strings.txt.pl8
2 files changed, 8 insertions, 22 deletions
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
@@ -178,6 +178,14 @@ 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
validation of encrypted tokens. These tokens are used to implement