diff --git a/MySQL_conf_pbx/test1/conf/odbc.ini b/MySQL_conf_pbx/test1/conf/odbc.ini index ee1cd81..f7c6bcf 100755 --- a/MySQL_conf_pbx/test1/conf/odbc.ini +++ b/MySQL_conf_pbx/test1/conf/odbc.ini @@ -1,14 +1,3 @@ -;[asterisk] -;Description = MariaDB connection to Asterisk -;Driver = MariaDB -;Server = mat_mariadb -;Database = asterisk_db -;User = asterisk_user -;Password = asterisk_pass -;Port = 3306 -;Option = 3 -;${HOST_IP} - [asterisk] Description = MariaDB connection to Asterisk Driver = MariaDB @@ -16,6 +5,6 @@ Driver = MariaDB Server = 127.0.0.1 Database = asterisk_db User = asterisk_user -Password = asterisk_pass -Port = 3306 +Password = 12345 +Port = 3308 Option = 3 \ No newline at end of file diff --git a/MySQL_conf_pbx/test1/docker-compose.yml b/MySQL_conf_pbx/test1/docker-compose.yml index 45ff579..d560d07 100755 --- a/MySQL_conf_pbx/test1/docker-compose.yml +++ b/MySQL_conf_pbx/test1/docker-compose.yml @@ -21,7 +21,8 @@ services: MYSQL_ROOT_PASSWORD: rootpassword MYSQL_DATABASE: asterisk_db MYSQL_USER: asterisk_user - MYSQL_PASSWORD: asterisk_pass + MYSQL_PASSWORD: 12345 + MYSQL_TCP_PORT: 3308 volumes: - ./mariadb_data:/var/lib/mysql # Persistent data network_mode: "host" diff --git a/MySQL_conf_pbx/test1/mariadb_data/aria_log.00000001 b/MySQL_conf_pbx/test1/mariadb_data/aria_log.00000001 index 196d50b..698aac5 100755 Binary files a/MySQL_conf_pbx/test1/mariadb_data/aria_log.00000001 and b/MySQL_conf_pbx/test1/mariadb_data/aria_log.00000001 differ diff --git a/MySQL_conf_pbx/test1/mariadb_data/aria_log_control b/MySQL_conf_pbx/test1/mariadb_data/aria_log_control index 052b5b4..be80bee 100755 Binary files a/MySQL_conf_pbx/test1/mariadb_data/aria_log_control and b/MySQL_conf_pbx/test1/mariadb_data/aria_log_control differ diff --git a/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/extensions_table.ibd b/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/extensions_table.ibd index af2f902..7d0a923 100755 Binary files a/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/extensions_table.ibd and b/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/extensions_table.ibd differ diff --git a/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/ps_aors.ibd b/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/ps_aors.ibd index 18fcca3..6ec92c0 100755 Binary files a/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/ps_aors.ibd and b/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/ps_aors.ibd differ diff --git a/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/ps_auths.ibd b/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/ps_auths.ibd index f8346ff..1863749 100755 Binary files a/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/ps_auths.ibd and b/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/ps_auths.ibd differ diff --git a/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/ps_endpoints.ibd b/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/ps_endpoints.ibd index ec2d65a..73f6b2f 100644 Binary files a/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/ps_endpoints.ibd and b/MySQL_conf_pbx/test1/mariadb_data/asterisk_db/ps_endpoints.ibd differ diff --git a/MySQL_conf_pbx/test1/mariadb_data/ddl_recovery.log b/MySQL_conf_pbx/test1/mariadb_data/ddl_recovery.log deleted file mode 100644 index 5e30b6d..0000000 Binary files a/MySQL_conf_pbx/test1/mariadb_data/ddl_recovery.log and /dev/null differ diff --git a/MySQL_conf_pbx/test1/mariadb_data/ib_buffer_pool b/MySQL_conf_pbx/test1/mariadb_data/ib_buffer_pool index 83c925c..6959b12 100644 --- a/MySQL_conf_pbx/test1/mariadb_data/ib_buffer_pool +++ b/MySQL_conf_pbx/test1/mariadb_data/ib_buffer_pool @@ -7,6 +7,7 @@ 11,4 11,3 10,3 +9,4 9,3 7,3 5,3 diff --git a/MySQL_conf_pbx/test1/mariadb_data/ib_logfile0 b/MySQL_conf_pbx/test1/mariadb_data/ib_logfile0 index 25824c7..503c462 100755 Binary files a/MySQL_conf_pbx/test1/mariadb_data/ib_logfile0 and b/MySQL_conf_pbx/test1/mariadb_data/ib_logfile0 differ diff --git a/MySQL_conf_pbx/test1/mariadb_data/ibdata1 b/MySQL_conf_pbx/test1/mariadb_data/ibdata1 index 78abea3..2356d92 100755 Binary files a/MySQL_conf_pbx/test1/mariadb_data/ibdata1 and b/MySQL_conf_pbx/test1/mariadb_data/ibdata1 differ diff --git a/MySQL_conf_pbx/test1/mariadb_data/ibtmp1 b/MySQL_conf_pbx/test1/mariadb_data/ibtmp1 deleted file mode 100644 index 202d95c..0000000 Binary files a/MySQL_conf_pbx/test1/mariadb_data/ibtmp1 and /dev/null differ diff --git a/MySQL_conf_pbx/test1/mariadb_data/tc.log b/MySQL_conf_pbx/test1/mariadb_data/tc.log deleted file mode 100644 index 0ca0162..0000000 Binary files a/MySQL_conf_pbx/test1/mariadb_data/tc.log and /dev/null differ diff --git a/MySQL_conf_pbx/test1/mariadb_data/undo001 b/MySQL_conf_pbx/test1/mariadb_data/undo001 index 4978d49..b71bd07 100755 Binary files a/MySQL_conf_pbx/test1/mariadb_data/undo001 and b/MySQL_conf_pbx/test1/mariadb_data/undo001 differ diff --git a/MySQL_conf_pbx/test1/mariadb_data/undo002 b/MySQL_conf_pbx/test1/mariadb_data/undo002 index 185b7be..1dfbc72 100755 Binary files a/MySQL_conf_pbx/test1/mariadb_data/undo002 and b/MySQL_conf_pbx/test1/mariadb_data/undo002 differ diff --git a/MySQL_conf_pbx/test1/mariadb_data/undo003 b/MySQL_conf_pbx/test1/mariadb_data/undo003 index da90243..f66220e 100755 Binary files a/MySQL_conf_pbx/test1/mariadb_data/undo003 and b/MySQL_conf_pbx/test1/mariadb_data/undo003 differ