diff --git a/application/config/database.php b/application/config/database.php index 6960102..4df7ede 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -74,22 +74,21 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $active_group = 'default'; $query_builder = TRUE; -// load back end here ----- -require_once('backend.php'); - $show_database_error = true; -$is_live = $wrenchboard->cfgReadChar("system.live"); -if ($is_live == false) { - $show_database_error = false; -} +$arr = array(); +$arr["host"] = "127.0.0.1"; +$arr["name"] = "wrenchboard"; +$arr["user"] = "wrenchboard"; +$arr["pass"] = "wrenchboard"; +$arr["port"] = 5432; $db['default'] = array( 'dsn' => '', - 'hostname' => $wrenchboard->cfgReadChar("database.host"), - 'username' => $wrenchboard->cfgReadChar("database.user"), - 'password' => $wrenchboard->cfgReadChar("database.pass"), - 'database' => $wrenchboard->cfgReadChar("database.name"), + 'hostname' => $arr["host"], + 'username' => $arr["user"], + 'password' => $arr["pass"], + 'database' => $arr["name"], 'dbdriver' => 'postgre', 'dbprefix' => '', 'pconnect' => FALSE, @@ -106,4 +105,3 @@ $db['default'] = array( 'failover' => array(), 'save_queries' => TRUE ); - diff --git a/backend.php b/backend.php index 814677f..0618fcc 100644 --- a/backend.php +++ b/backend.php @@ -1,4 +1,5 @@ diff --git a/docker/apache/Dockerfile b/docker/apache/Dockerfile index 969281d..24580e8 100644 --- a/docker/apache/Dockerfile +++ b/docker/apache/Dockerfile @@ -14,6 +14,7 @@ RUN apt-get install -y \ libmcrypt-dev \ libreadline-dev \ libfreetype6-dev \ + libpq-dev \ g++ RUN docker-php-ext-install \ @@ -23,7 +24,9 @@ RUN docker-php-ext-install \ opcache \ calendar \ pdo_mysql \ - mysqli + mysqli \ + pdo \ + pdo_pgsql # 2. set up document root for apache COPY docker/apache/000-default.conf /etc/apache2/sites-available/000-default.conf