aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/general.yml-example4
-rw-r--r--conf/packages2
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/general.yml-example b/conf/general.yml-example
index 1418b0810..06af11a55 100644
--- a/conf/general.yml-example
+++ b/conf/general.yml-example
@@ -52,7 +52,9 @@ IPHONE_URL: ''
# Log file (used in test harness, and later in admin scripts)
HTTPD_ERROR_LOG: '/var/log/apache/error.log'
-ALLOWED_COBRANDS: 'cobrand_one|cobrand_two'
+ALLOWED_COBRANDS:
+ - cobrand_one
+ - cobrand_two: 'hostname_substring2'
# How many items are returned in the GeoRSS feeds by default
RSS_LIMIT: '20'
diff --git a/conf/packages b/conf/packages
index 766e7747c..21ee0a862 100644
--- a/conf/packages
+++ b/conf/packages
@@ -16,7 +16,6 @@ libsoap-lite-perl
libstatistics-distributions-perl
liburi-perl
libwww-perl
-libwww-perl
libxml-rss-perl
memcached
perl
@@ -26,7 +25,6 @@ perlmagick
libjson-perl
libimage-size-perl
libmath-bigint-gmp-perl
-libtext-template-perl
gettext
libtest-exception-perl
libipc-run3-perl