Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/WrenchBackOffice
# Conflicts: # application/config/config.php
This commit is contained in:
@@ -48,8 +48,7 @@ spl_autoload_register(function($classname) {
|
||||
|
||||
//$config['base_url'] = $wrenchboard->cfgReadChar("system.base_url"); //'http://oameye.works.wrenchboard.com/';
|
||||
// $config['base_url'] = "http://192.168.1.140:9085/"; // 'https://'.$_SERVER['SERVER_NAME'].'/';
|
||||
// $config['base_url'] = 'http://'.$_SERVER['SERVER_NAME'].':9085/';
|
||||
$config['base_url'] = 'http://'.$_SERVER['SERVER_NAME'].'/';
|
||||
$config['base_url'] = '/'; //'http://'.$_SERVER['SERVER_NAME'].':9085/';
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Index File
|
||||
|
||||
@@ -21,6 +21,7 @@ services:
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
- oameye.works.wrenchboard.com:10.20.30.27
|
||||
- oameye.work.wrenchboard.com:10.10.33.15
|
||||
- backend.wrenchboard.api.live:10.10.33.15
|
||||
- backend.wrenchboard.api.test:10.10.33.15
|
||||
#- backend.wrenchboard.api.live:172.31.4.27
|
||||
|
||||
Reference in New Issue
Block a user