Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 654ccdb

Browse files
spinlockspinlock
committed
deploy: replace ':' by '_'
1 parent ef482da commit 654ccdb

40 files changed

Lines changed: 8 additions & 8 deletions

‎deploy/products/alpha/render.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def render(self, proxylist):
7474
'ETC_PATH': self.env.etc_path,
7575
'LOG_PATH': self.env.log_path,
7676
}
77-
base = os.path.join(generate_root, self.env.etc_path.lstrip('/'), self.admin_addr)
77+
base = os.path.join(generate_root, self.env.etc_path.lstrip('/'), self.admin_addr.replace(':', '_'))
7878

7979
temp = readfile(template_root, "dashboard.toml.template")
8080
generate(base, "dashboard.toml", temp.format(**kwargs))
@@ -105,7 +105,7 @@ def render(self, proxylist):
105105

106106
cwd = os.getcwd()
107107
os.chdir(os.path.join(base, ".."))
108-
symlink(self.admin_addr, self.product.name)
108+
symlink(self.admin_addr.replace(':', '_'), self.product.name)
109109
os.chdir(cwd)
110110

111111

@@ -155,7 +155,7 @@ def render(self):
155155
'ETC_PATH': self.env.etc_path,
156156
'LOG_PATH': self.env.log_path,
157157
}
158-
base = os.path.join(generate_root, self.env.etc_path.lstrip('/'), self.proxy_addr)
158+
base = os.path.join(generate_root, self.env.etc_path.lstrip('/'), self.proxy_addr.replace(':', '_'))
159159

160160
temp = readfile(template_root, "proxy.toml.template")
161161
generate(base, "proxy.toml", temp.format(**kwargs))

‎deploy/products/beta/render.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def render(self, proxylist):
7474
'ETC_PATH': self.env.etc_path,
7575
'LOG_PATH': self.env.log_path,
7676
}
77-
base = os.path.join(generate_root, self.env.etc_path.lstrip('/'), self.admin_addr)
77+
base = os.path.join(generate_root, self.env.etc_path.lstrip('/'), self.admin_addr.replace(':', '_'))
7878

7979
temp = readfile(template_root, "dashboard.toml.template")
8080
generate(base, "dashboard.toml", temp.format(**kwargs))
@@ -105,7 +105,7 @@ def render(self, proxylist):
105105

106106
cwd = os.getcwd()
107107
os.chdir(os.path.join(base, ".."))
108-
symlink(self.admin_addr, self.product.name)
108+
symlink(self.admin_addr.replace(':', '_'), self.product.name)
109109
os.chdir(cwd)
110110

111111

@@ -155,7 +155,7 @@ def render(self):
155155
'ETC_PATH': self.env.etc_path,
156156
'LOG_PATH': self.env.log_path,
157157
}
158-
base = os.path.join(generate_root, self.env.etc_path.lstrip('/'), self.proxy_addr)
158+
base = os.path.join(generate_root, self.env.etc_path.lstrip('/'), self.proxy_addr.replace(':', '_'))
159159

160160
temp = readfile(template_root, "proxy.toml.template")
161161
generate(base, "proxy.toml", temp.format(**kwargs))

deploy/root/opt/codis/etc/10.2.16.200:19000/codis_proxy_19000.service renamed to deploy/root/opt/codis/etc/10.2.16.200_19000/codis_proxy_19000.service

File renamed without changes.

deploy/root/opt/codis/etc/10.2.16.200:19000/proxy.toml renamed to deploy/root/opt/codis/etc/10.2.16.200_19000/proxy.toml

File renamed without changes.

deploy/root/opt/codis/etc/10.2.16.200:19000/proxy_admin renamed to deploy/root/opt/codis/etc/10.2.16.200_19000/proxy_admin

File renamed without changes.

deploy/root/opt/codis/etc/10.2.16.201:19000/codis_proxy_19000.service renamed to deploy/root/opt/codis/etc/10.2.16.201_19000/codis_proxy_19000.service

File renamed without changes.

deploy/root/opt/codis/etc/10.2.16.201:19000/proxy.toml renamed to deploy/root/opt/codis/etc/10.2.16.201_19000/proxy.toml

File renamed without changes.

deploy/root/opt/codis/etc/10.2.16.201:19000/proxy_admin renamed to deploy/root/opt/codis/etc/10.2.16.201_19000/proxy_admin

File renamed without changes.

deploy/root/opt/codis/etc/10.2.16.202:19000/codis_proxy_19000.service renamed to deploy/root/opt/codis/etc/10.2.16.202_19000/codis_proxy_19000.service

File renamed without changes.

deploy/root/opt/codis/etc/10.2.16.202:19000/proxy.toml renamed to deploy/root/opt/codis/etc/10.2.16.202_19000/proxy.toml

File renamed without changes.

0 commit comments

Comments
 (0)