Simplified configuration script
diff --git a/Changes b/Changes
index 76a369c..3560880 100755
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
-0.18 2015-02-13
+0.18 2016-02-29
- Support for dashes in identifiers.
- Minor changes to the layout.
+ - Simplified configuration file.
0.17 2015-11-13
- Support a larger template cache.
diff --git a/kalamar.conf b/kalamar.conf
index 1bdf667..2fa18ef 100644
--- a/kalamar.conf
+++ b/kalamar.conf
@@ -1,8 +1,4 @@
{
- Notifications => {
- 'Kalamar::Plugin::Notifications' => 1,
- JSON => 1
- },
Search => {
engine => 'Kalamar::API',
# api => 'http://10.0.10.13:7070/api/v0.1/'
@@ -21,17 +17,6 @@
inactivity_timeout => 120,
proxy => 1
},
- 'TagHelpers-Pagination' => {
- prev => '<span><span><</span></span>',
- next => '<span><span><</span></span>',
- ellipsis => '<a class="ellipsis"><span><span>...</span></span></a>',
- separator => '',
- current => '<span>{current}</span>',
- page => '<span>{page}</span>'
- },
- Localize => {
- resources => ['kalamar.dict']
- },
MailException => {
from => join('@', 'korap', 'ids-mannheim.de'),
to => join('@', 'korap', 'ids-mannheim.de'),
diff --git a/lib/Kalamar.pm b/lib/Kalamar.pm
index a9dd538..0ffe83d 100644
--- a/lib/Kalamar.pm
+++ b/lib/Kalamar.pm
@@ -54,10 +54,29 @@
$self->log->warn('Please create a kalamar.secret file');
};
+ # Configuration framework
+ $self->plugin('Config' => {
+ default => {
+ Localize => {
+ resources => ['kalamar.dict']
+ },
+ },
+ 'TagHelpers-Pagination' => {
+ prev => '<span><span><</span></span>',
+ next => '<span><span><</span></span>',
+ ellipsis => '<a class="ellipsis"><span><span>...</span></span></a>',
+ separator => '',
+ current => '<span>{current}</span>',
+ page => '<span>{page}</span>'
+ },
+ Notifications => {
+ 'Kalamar::Plugin::Notifications' => 1,
+ JSON => 1
+ }
+ });
# Load plugins
foreach (
- 'Config', # Configuration framework
'Localize', # Localization framework
'Notifications', # Client notifications
'Search', # Abstract Search framework