From 6f2cd1fa1b83fb817dd597f1caf1923f8b9d3aa6 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Mon, 21 Jun 2021 09:50:56 +0800 Subject: [PATCH] Generate the correct path in the sql config --- tool/quick_start_win10/external/web_config.py | 6 ++++-- tool/quick_start_win10/external/web_config.sql | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tool/quick_start_win10/external/web_config.py b/tool/quick_start_win10/external/web_config.py index 5f34c297f..f73d55a2e 100644 --- a/tool/quick_start_win10/external/web_config.py +++ b/tool/quick_start_win10/external/web_config.py @@ -1,6 +1,8 @@ -import socket +import socket, os hostname = socket.gethostname() +root = os.getenv('RC_ROOT').replace('\\', '/') +shardDev = root + '/pipeline/shard_dev' with open("web_config.sql", "r") as fr: with open("web_config_local.sql", "w") as fw: for l in fr: - fw.write(l.replace("%RC_HOSTNAME%", hostname)) + fw.write(l.replace("%RC_HOSTNAME%", hostname).replace("%RC_SHARD_DEV%", shardDev)) diff --git a/tool/quick_start_win10/external/web_config.sql b/tool/quick_start_win10/external/web_config.sql index bda15bc6b..6f94029b2 100644 --- a/tool/quick_start_win10/external/web_config.sql +++ b/tool/quick_start_win10/external/web_config.sql @@ -5,7 +5,7 @@ INSERT INTO `domain` (`domain_id`, `domain_name`, `status`, `patch_version`, `ba -- Add the domain to the NeL Admin Tool database USE `nel_tool`; -INSERT INTO `neltool_domains` (`domain_id`, `domain_name`, `domain_as_host`, `domain_as_port`, `domain_rrd_path`, `domain_las_admin_path`, `domain_las_local_path`, `domain_application`, `domain_sql_string`, `domain_hd_check`, `domain_mfs_web`, `domain_cs_sql_string`) VALUES ('90', 'dev', '%RC_HOSTNAME%', '46999', '%RC_SHARD_DEV%\\rrd_graphs', '', '', 'dev', 'mysql://root@%RC_HOSTNAME%:9040/ring_dev', '0', NULL, NULL); +INSERT INTO `neltool_domains` (`domain_id`, `domain_name`, `domain_as_host`, `domain_as_port`, `domain_rrd_path`, `domain_las_admin_path`, `domain_las_local_path`, `domain_application`, `domain_sql_string`, `domain_hd_check`, `domain_mfs_web`, `domain_cs_sql_string`) VALUES ('90', 'dev', '%RC_HOSTNAME%', '46999', '%RC_SHARD_DEV%/rrd_graphs', '', '', 'dev', 'mysql://root@%RC_HOSTNAME%:9040/ring_dev', '0', NULL, NULL); -- Add the mainland shard to the NeL database use `nel`;