View | Details | Raw Unified | Return to bug 39740
Collapse All | Expand All

(-)a/debian/scripts/koha-functions.sh (-7 / +7 lines)
Lines 401-420 is_git_install() Link Here
401
    fi
401
    fi
402
}
402
}
403
403
404
is_test_system()
404
is_debug_mode()
405
{
405
{
406
    local instancename=$1 test_system
406
    local instancename=$1 debug_mode
407
407
408
    # env var TEST_SYSTEM overrules koha-conf entry
408
    # env var DEBUG_MODE overrules koha-conf entry
409
    if [ -n "$TEST_SYSTEM" ]; then
409
    if [ -n "$DEBUG_MODE" ]; then
410
        if [ "$TEST_SYSTEM" != "0" ]; then return 0; else return 1; fi
410
        if [ "$DEBUG_MODE" != "0" ]; then return 0; else return 1; fi
411
    fi
411
    fi
412
412
413
    # now check koha-conf
413
    # now check koha-conf
414
    if [ "$instancename" != "" ] && is_instance $instancename; then
414
    if [ "$instancename" != "" ] && is_instance $instancename; then
415
        test_system=$(run_safe_xmlstarlet $instancename test_system)
415
        debug_mode=$(run_safe_xmlstarlet $instancename debug_mode)
416
    fi
416
    fi
417
    if [ -n "$test_system" ] && [ "test_system" != "0" ]; then
417
    if [ -n "$debug_mode" ] && [ "debug_mode" != "0" ]; then
418
        return 0; # true
418
        return 0; # true
419
    else
419
    else
420
        return 1
420
        return 1
(-)a/debian/scripts/koha-plack (-1 / +1 lines)
Lines 92-98 start_plack() Link Here
92
92
93
    instance_user="${instancename}-koha"
93
    instance_user="${instancename}-koha"
94
94
95
    if is_test_system ${instancename} || [ -n "$development_environment" ]; then
95
    if is_debug_mode ${instancename} || [ -n "$development_environment" ]; then
96
        environment="development"
96
        environment="development"
97
    else
97
    else
98
        environment="deployment"
98
        environment="deployment"
(-)a/debian/scripts/koha-z3950-responder (-2 / +2 lines)
Lines 86-92 start_z3950() Link Here
86
    logging="-l /var/log/koha/${instancename}/z3950.log"
86
    logging="-l /var/log/koha/${instancename}/z3950.log"
87
87
88
    Z3950RESPONDER="/usr/bin/perl $KOHA_HOME/$KOHA_BINDIR/z3950_responder.pl"
88
    Z3950RESPONDER="/usr/bin/perl $KOHA_HOME/$KOHA_BINDIR/z3950_responder.pl"
89
    if [ "$debug_mode" = "yes" ] && is_test_system $instancename; then
89
    if [ "$debug_mode" = "yes" ] && is_debug_mode $instancename; then
90
        environment="development"
90
        environment="development"
91
        daemonize=""
91
        daemonize=""
92
        logging="" # remote debugger takes care
92
        logging="" # remote debugger takes care
Lines 298-304 if [ $# -gt 0 ]; then Link Here
298
            PERL5LIB=$PERL5LIB:$KOHA_HOME/installer:$KOHA_HOME/lib/installer
298
            PERL5LIB=$PERL5LIB:$KOHA_HOME/installer:$KOHA_HOME/lib/installer
299
            # If debug mode is enabled, add the debugger lib path
299
            # If debug mode is enabled, add the debugger lib path
300
            # to PERL5LIB if appropriate
300
            # to PERL5LIB if appropriate
301
            if [ "$debug_mode" = "yes" ] && is_test_system $name; then
301
            if [ "$debug_mode" = "yes" ] && is_debug_mode $name; then
302
                if [ "$debugger_path" != "" ]; then
302
                if [ "$debugger_path" != "" ]; then
303
                    PERL5LIB="${debugger_path}":$PERL5LIB
303
                    PERL5LIB="${debugger_path}":$PERL5LIB
304
                fi
304
                fi
(-)a/debian/templates/koha-conf-site.xml.in (-2 / +2 lines)
Lines 411-419 __END_SRU_PUBLICSERVER__ Link Here
411
411
412
 <!-- flags for development purposes
412
 <!-- flags for development purposes
413
      git_install is used to adjust some paths specific to git installations (fka dev_install)
413
      git_install is used to adjust some paths specific to git installations (fka dev_install)
414
      test_system is used to differentiate production from test systems (see for example koha-plack) -->
414
      debug_mode is used to differentiate production from test systems (see for example koha-plack) -->
415
 <git_install>0</git_install>
415
 <git_install>0</git_install>
416
 <test_system>0</test_system>
416
 <debug_mode>0</debug_mode>
417
417
418
 <!-- strict_sql_modes should not be used in a production environment
418
 <!-- strict_sql_modes should not be used in a production environment
419
      developers use it to catch bugs related to strict SQL modes -->
419
      developers use it to catch bugs related to strict SQL modes -->
(-)a/etc/koha-conf.xml (-3 / +2 lines)
Lines 230-238 Link Here
230
230
231
 <!-- flags for development purposes
231
 <!-- flags for development purposes
232
      git_install is used to adjust some paths specific to git installations (fka dev_install)
232
      git_install is used to adjust some paths specific to git installations (fka dev_install)
233
      test_system is used to differentiate production from test systems (see for example koha-plack) -->
233
      debug_mode is used to differentiate production from test systems (see for example koha-plack) -->
234
 <git_install>0</git_install>
234
 <git_install>0</git_install>
235
 <test_system>0</test_system>
235
 <debug_mode>0</debug_mode>
236
236
237
 <!-- strict_sql_modes should not be used in a production environment
237
 <!-- strict_sql_modes should not be used in a production environment
238
      developers use it to catch bugs related to strict SQL modes -->
238
      developers use it to catch bugs related to strict SQL modes -->
239
- 

Return to bug 39740