From 9970dfc9f45ded339cb11f509f918920016747ea Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 2 Oct 2013 19:52:42 +0200 Subject: [PATCH] Initialize variables in bootstrap.json templates --- .../var/lib/ajaxplorer/plugins/boot.conf/bootstrap.json/10All | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/boot.conf/bootstrap.json/10All b/root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/boot.conf/bootstrap.json/10All index 909084d..8fa62bf 100644 --- a/root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/boot.conf/bootstrap.json/10All +++ b/root/etc/e-smith/templates/var/lib/ajaxplorer/plugins/boot.conf/bootstrap.json/10All @@ -1,13 +1,18 @@ { use JSON; +my $dbn = $ajaxplorer{'DbName'} || 'ajaxplorer'; +my $dbu = $ajaxplorer{'DbUser'} || 'ajaxplorer'; +my $dbp = $ajaxplorer{'DbPassword'} || 'secret'; +my $url = $ajaxplorer{'LogoutUrl'} || ''; + my $data = { 'core.conf' => { 'USERS_LIST_COMPLETE_MIN_CHARS' => '3', 'SKIP_USER_HISTORY' => JSON::PP::true, 'DIBI_PRECONFIGURATION' => { 'mysql_username' => $dbu, - 'mysql_password' => $dbpw, + 'mysql_password' => $dbp, 'mysql_driver' => 'mysql', 'group_switch_value' => 'mysql', 'mysql_database' => $dbn, @@ -29,7 +34,7 @@ my $data = { }, 'core.auth' => { 'MASTER_INSTANCE_CONFIG' => { - 'LOGOUT_URL' => 'https://auth.' . $DomainName, + 'LOGOUT_URL' => $url, 'LOGIN_REDIRECT' => '', 'instance_name' => 'auth.basic_http', 'AJXP_ADMIN_LOGIN' => '',