From c23a8e2ee8d03be761a8eb2809be019f6bb49e6a Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Tue, 15 Oct 2013 15:28:16 +0200 Subject: [PATCH] Use the generic JSON::true and JSON::false boolean notation so it can work with JSON::XS (if installed) or JSON::PP --- .../plugins/boot.conf/bootstrap.json/10All | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 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 97c09f0..a9df2ec 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 @@ -9,7 +9,7 @@ my $url = $ajaxplorer{'LogoutUrl'} || ''; my $data = { 'core.conf' => { 'USERS_LIST_COMPLETE_MIN_CHARS' => '3', - 'SKIP_USER_HISTORY' => JSON::PP::true, + 'SKIP_USER_HISTORY' => JSON::true, 'DIBI_PRECONFIGURATION' => { 'mysql_username' => $dbu, 'mysql_password' => $dbp, @@ -19,18 +19,18 @@ my $data = { 'mysql_host' => 'localhost' }, 'UNIQUE_INSTANCE_CONFIG' => { - 'FAST_CHECKS' => JSON::PP::true, + 'FAST_CHECKS' => JSON::true, 'ROLES_FILEPATH' => '/var/lib/ajaxplorer/plugins/auth.serial/roles.ser', 'USERS_DIRPATH' => '/var/lib/ajaxplorer/plugins/auth.serial', 'instance_name' => 'conf.serial', 'group_switch_value' => 'conf.serial', 'REPOSITORIES_FILEPATH' => '/var/lib/ajaxplorer/plugins/conf.serial/repo.ser' }, - 'USER_CREATE_REPOSITORY' => JSON::PP::false, - 'SAVE_GUEST_PREFERENCES' => JSON::PP::false, - 'USERS_LIST_HIDE_LOGIN' => JSON::PP::false, + 'USER_CREATE_REPOSITORY' => JSON::false, + 'SAVE_GUEST_PREFERENCES' => JSON::false, + 'USERS_LIST_HIDE_LOGIN' => JSON::false, 'USERS_LIST_COMPLETE_LIMIT' => '20', - 'ALLOW_CROSSUSERS_SHARING' => JSON::PP::true, + 'ALLOW_CROSSUSERS_SHARING' => JSON::true, }, 'core.auth' => { 'MASTER_INSTANCE_CONFIG' => { @@ -38,22 +38,22 @@ my $data = { 'LOGIN_REDIRECT' => '', 'instance_name' => 'auth.basic_http', 'AJXP_ADMIN_LOGIN' => '', - 'TRANSMIT_CLEAR_PASS' => JSON::PP::true, - 'AUTOCREATE_AJXPUSER' => JSON::PP::false, + 'TRANSMIT_CLEAR_PASS' => JSON::true, + 'AUTOCREATE_AJXPUSER' => JSON::false, 'group_switch_value' => 'auth.basic_http', 'USERS_FILEPATH' => '/var/lib/ajaxplorer/plugins/auth.serial/users.ser' }, 'SLAVE_INSTANCE_CONFIG_group_switch' => '', 'SLAVE_INSTANCE_CONFIG' => [], - 'SECURE_LOGIN_FORM' => JSON::PP::false, - 'SESSION_SET_CREDENTIALS' => JSON::PP::false, + 'SECURE_LOGIN_FORM' => JSON::false, + 'SESSION_SET_CREDENTIALS' => JSON::false, 'MULTI_MODE' => { 'instance_name' => 'MASTER_SLAVE', 'group_switch_value' => 'MASTER_SLAVE' }, - 'CASE_SENSITIVE' => JSON::PP::true, - 'ENABLE_USERS' => JSON::PP::true, - 'ALLOW_GUEST_BROWSING' => JSON::PP::false, + 'CASE_SENSITIVE' => JSON::true, + 'ENABLE_USERS' => JSON::true, + 'ALLOW_GUEST_BROWSING' => JSON::false, 'MULTI_USER_BASE_DRIVER' => '', 'PASSWORD_MINLENGTH' => '8' }