diff --git a/install/dist/conf/centos52.conf.php b/install/dist/conf/centos52.conf.php index 9a7e2d0cadfd8e64cbb6e411f18446812237ea9e..3bca2eba5482cebb1ca5d4f7512b3f78661e2485 100644 --- a/install/dist/conf/centos52.conf.php +++ b/install/dist/conf/centos52.conf.php @@ -66,6 +66,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(uniqid(rand())); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/centos53.conf.php b/install/dist/conf/centos53.conf.php index 9a7e2d0cadfd8e64cbb6e411f18446812237ea9e..3bca2eba5482cebb1ca5d4f7512b3f78661e2485 100644 --- a/install/dist/conf/centos53.conf.php +++ b/install/dist/conf/centos53.conf.php @@ -66,6 +66,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(uniqid(rand())); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/centos70.conf.php b/install/dist/conf/centos70.conf.php index efe166e0791214cc26afc6768712a14283c31c2a..84b90b732a25209fbead179a09aed4deba76b4a5 100644 --- a/install/dist/conf/centos70.conf.php +++ b/install/dist/conf/centos70.conf.php @@ -66,6 +66,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(uniqid(rand())); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/centos72.conf.php b/install/dist/conf/centos72.conf.php index f4a3c937baf7e1bcb42ae5701605458e1465a2af..9f2c84140c47e168ff69b37501b90cd871cb0686 100644 --- a/install/dist/conf/centos72.conf.php +++ b/install/dist/conf/centos72.conf.php @@ -66,6 +66,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(uniqid(rand())); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/centos80.conf.php b/install/dist/conf/centos80.conf.php index 1a354d3644f0033739b79a8406ac9a2d188b7c41..b69e578d40e089368bf17d0c33b0086c3a1fd314 100644 --- a/install/dist/conf/centos80.conf.php +++ b/install/dist/conf/centos80.conf.php @@ -66,6 +66,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(random_bytes(20)); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/debian100.conf.php b/install/dist/conf/debian100.conf.php index 30f483980aad9cf651d70f2ca507085ece7d2814..c98a2677ec2f1f89f4294a4d5118df77c43bcfe7 100644 --- a/install/dist/conf/debian100.conf.php +++ b/install/dist/conf/debian100.conf.php @@ -68,6 +68,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(random_bytes(20)); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/debian110.conf.php b/install/dist/conf/debian110.conf.php index ce5bda7170aae2a3db322c9dd43650d67c462ef0..8b81c8680c0b015ece0ae42ef96647aa4591c1dc 100644 --- a/install/dist/conf/debian110.conf.php +++ b/install/dist/conf/debian110.conf.php @@ -68,6 +68,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(random_bytes(20)); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/debian40.conf.php b/install/dist/conf/debian40.conf.php index 653b979a6735aef6823fc5a8ad0af603ec65e90c..861585fe3c4f5ff6d1188b145772ec65e6f9003c 100644 --- a/install/dist/conf/debian40.conf.php +++ b/install/dist/conf/debian40.conf.php @@ -68,6 +68,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(uniqid(rand())); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/debian60.conf.php b/install/dist/conf/debian60.conf.php index 3577869bcd908616b54c7d4eb67756e01008f526..6c7c4403014487261f69009cad8e881e6d15ffa5 100644 --- a/install/dist/conf/debian60.conf.php +++ b/install/dist/conf/debian60.conf.php @@ -68,6 +68,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(uniqid(rand())); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/debian90.conf.php b/install/dist/conf/debian90.conf.php index 1abbf732a1201da6d2ef036bc5c60f8affdb7d83..906fda1c0e09eecbb0f1a223a9aea7a13b07433a 100644 --- a/install/dist/conf/debian90.conf.php +++ b/install/dist/conf/debian90.conf.php @@ -68,6 +68,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(random_bytes(20)); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/debiantesting.conf.php b/install/dist/conf/debiantesting.conf.php index 6564be0dab1be4dc5924ce9157a15496459b65c5..03f2612377330d50b7f5614693008d8982b5fcd0 100644 --- a/install/dist/conf/debiantesting.conf.php +++ b/install/dist/conf/debiantesting.conf.php @@ -68,6 +68,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(random_bytes(20)); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/fedora32.conf.php b/install/dist/conf/fedora32.conf.php index 0280959988e0a2a8ef4ad57d354580dd350aba17..8e05e8f732618bea8704bc408ddc96f189f22d31 100644 --- a/install/dist/conf/fedora32.conf.php +++ b/install/dist/conf/fedora32.conf.php @@ -68,6 +68,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(uniqid(rand())); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/fedora33.conf.php b/install/dist/conf/fedora33.conf.php index 677731c01e20c4c184218777e3c6e55f1b303b5e..05b0795afa9998faf0ef59aa67481202e4758a98 100644 --- a/install/dist/conf/fedora33.conf.php +++ b/install/dist/conf/fedora33.conf.php @@ -68,6 +68,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(uniqid(rand())); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/fedora9.conf.php b/install/dist/conf/fedora9.conf.php index c05d21a155ee3545dafab4fb647b62d81bada6d8..49802db9d6e59beb1ba6527b2f8557e505e798a6 100644 --- a/install/dist/conf/fedora9.conf.php +++ b/install/dist/conf/fedora9.conf.php @@ -66,6 +66,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(uniqid(rand())); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/gentoo.conf.php b/install/dist/conf/gentoo.conf.php index 1252fc7a76fe8ea270cb2da0c1cf2f6bcd91b5b8..fbd169752a84b129eccb44800d6749f88b2b3d99 100644 --- a/install/dist/conf/gentoo.conf.php +++ b/install/dist/conf/gentoo.conf.php @@ -68,6 +68,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(random_bytes(20)); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/opensuse110.conf.php b/install/dist/conf/opensuse110.conf.php index ac4f5a3e1850cf708199050e80d8c2bbdee2916d..0bdb1e4772df276ab098e8ee79696dfed11da3a6 100644 --- a/install/dist/conf/opensuse110.conf.php +++ b/install/dist/conf/opensuse110.conf.php @@ -66,6 +66,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(uniqid(rand())); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/opensuse112.conf.php b/install/dist/conf/opensuse112.conf.php index eda4879004b23af81d6c9db6127b6c1b94697ba6..58cc77c4f23e85509faf7f9ccdf4b68954dc0791 100644 --- a/install/dist/conf/opensuse112.conf.php +++ b/install/dist/conf/opensuse112.conf.php @@ -66,6 +66,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(uniqid(rand())); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/ubuntu1604.conf.php b/install/dist/conf/ubuntu1604.conf.php index 1893a93fbf09516e25b3e2cc0f2cbc6f22f7c187..b7c68c7bbf9c78eded96adfda2977ed1d53cd6fe 100644 --- a/install/dist/conf/ubuntu1604.conf.php +++ b/install/dist/conf/ubuntu1604.conf.php @@ -68,6 +68,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(random_bytes(20)); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/ubuntu1710.conf.php b/install/dist/conf/ubuntu1710.conf.php index b37c91291f2182fd4cc7b506f4b657cc8c3608fd..26b575888f3dccf2d1b284281013b82cb20020b8 100644 --- a/install/dist/conf/ubuntu1710.conf.php +++ b/install/dist/conf/ubuntu1710.conf.php @@ -68,6 +68,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(random_bytes(20)); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/ubuntu1804.conf.php b/install/dist/conf/ubuntu1804.conf.php index 9c2721141329f762368f14003efd67243b6f3c14..319930698b81d4c5708b530afc7bfac462c312f8 100644 --- a/install/dist/conf/ubuntu1804.conf.php +++ b/install/dist/conf/ubuntu1804.conf.php @@ -68,6 +68,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(random_bytes(20)); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/dist/conf/ubuntu2004.conf.php b/install/dist/conf/ubuntu2004.conf.php index 72bf90d45eefb06f65a54ff05c28057f4e5c12f7..546e2f57d7df7c472d9c0c2862d8a45fcbdb48f9 100644 --- a/install/dist/conf/ubuntu2004.conf.php +++ b/install/dist/conf/ubuntu2004.conf.php @@ -68,6 +68,7 @@ $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5(random_bytes(20)); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; +$conf['mysql']['master_port'] = '3306'; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index b3610db6107140a9a0f7a4bb049e9bdb28ea4536..05312093120cce474839bce6775a40393bb8cc05 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -2187,7 +2187,7 @@ class installer_base { //* Backup exiting file if(is_file($full_file_name)) { - copy($full_file_name, $config_dir.$configfile.'~'); + copy($full_file_name, $full_file_name.'~'); } $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master'); $content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);