Cleanup: set the default examples and program settings for connecting to the database...

This simplifies the work necessary for testing and initial setups.
Setting up a cert is extra work, so do no use it by default for database calls.

diff --git a/examples/http.php b/examples/http.php
index 93f910d54af1b3e2892406ed73602ab6793977d9..8e02d090f399bc24163fa7fb2cf1418b346c5ca3 100644 (file)
--- a/examples/http.php
+++ b/examples/http.php
@@ -414,7 +414,8 @@
     if (!is_null($password)) {
       $connection_string->set_password($password);
     }
-    $connection_string->set_ssl_mode('require');
+    #$connection_string->set_ssl_mode('require');
+    $connection_string->set_ssl_mode('disable');
     $connection_string->set_connect_timeout(4);
     $database->set_connection_string($connection_string);
     unset($connection_string);

diff --git a/examples/test.php b/examples/test.php
index 5f6ae0c732a10615320294020b25436c6bd5842a..992ccce052d63ed0d341a0c441364e830b264302 100755 (executable)
--- a/examples/test.php
+++ b/examples/test.php
@@ -744,7 +744,8 @@
     $connection_string->set_database('reservation');
     $connection_string->set_user($username);
     $connection_string->set_password($password);
-    $connection_string->set_ssl_mode('require');
+    #$connection_string->set_ssl_mode('require');
+    $connection_string->set_ssl_mode('disable');
     $connection_string->set_connect_timeout(4);
     $database->set_connection_string($connection_string);
     unset($connection_string);

diff --git a/program/reservation/index.php b/program/reservation/index.php
index 669daec364929f543d6f884d57cdf08b00635a34..f1b6326fd3e2235640717b345a289f54bbdb4337 100644 (file)
--- a/program/reservation/index.php
+++ b/program/reservation/index.php
@@ -42,7 +42,8 @@
     $settings['database_user'] = 'u_reservation_public';
     $settings['database_password'] = NULL;
     $settings['database_timeout'] = 4;
-    $settings['database_ssl_mode'] = 'require';
+    #$settings['database_ssl_mode'] = 'require';
+    $settings['database_ssl_mode'] = 'disable';
     $settings['database_create_account_host'] = '127.0.0.1';
     $settings['database_create_account_port'] = 5433;