@@ -11,7 +11,6 @@ import (
1111 "github.com/devetek/d-panel-cli/internal/tunnel"
1212 "github.com/devetek/d-panel/pkg/dmachine"
1313 "github.com/devetek/d-panel/pkg/drouter"
14- "github.com/devetek/d-panel/pkg/dsecret"
1514 "github.com/spf13/cobra"
1615 "go.uber.org/zap"
1716)
@@ -72,38 +71,15 @@ func (m *MachineCmd) create() *cobra.Command {
7271 return
7372 }
7473
75- // get list secret ssh
76- secretSSH , err := client .GetListSecretSSH ()
74+ // always create new SSH key
75+ newSSHKey , err := client .CreateSecretSSH ()
7776 if err != nil {
78- logger .Error ("Error get list secret ssh: " + err .Error ())
77+ logger .Error ("Error create secret ssh: " + err .Error ())
7978 return
8079 }
8180
82- var mySSHKey dsecret.Response
83- if secretSSH .Data .Pagination .TotalItem == 0 {
84- // create new SSH key
85- newSSHKey , err := client .CreateSecretSSH ()
86- if err != nil {
87- logger .Error ("Error create secret ssh: " + err .Error ())
88- return
89- }
90-
91- // assign from new SSH key
92- mySSHKey = newSSHKey .Data
93- } else {
94- // get first secret ssh from existing
95- mySSHKey = secretSSH .Data .Secrets [0 ]
96-
97- // get detail secret ssh
98- detailSSHKey , err := client .GetSecretSSHByID (fmt .Sprintf ("%d" , mySSHKey .ID ))
99- if err != nil {
100- logger .Error ("Error get detail secret ssh: " + err .Error ())
101- return
102- }
103-
104- // assign from detail SSH key
105- mySSHKey = detailSSHKey .Data
106- }
81+ // assign from new SSH key
82+ mySSHKey := newSSHKey .Data
10783
10884 if ! helper .IsSSHAuthorized (mySSHKey .Data .Data ()["public" ]) {
10985 // append ssh key to authorized_keys file
@@ -174,14 +150,14 @@ func (m *MachineCmd) create() *cobra.Command {
174150 Type : "proxy_pass" ,
175151 Name : fmt .Sprintf ("http-%s-to-%s" , tunnelHTTPPort , originHTTPPort ),
176152 Domain : fmt .Sprintf ("http-%s-to-%s 1" , tunnelHTTPPort , originHTTPPort ),
177- MachineID : 11 ,
153+ MachineID : 157 ,
178154 Upstream : fmt .Sprintf ("localhost:%s" , tunnelHTTPPort ),
179155 }
180156
181157 router , err := client .CreateRouter (payload )
182158 if err != nil {
183159 logger .Error ("Failed to create HTTP server for this machine, with error " + err .Error ())
184- logger .Error ("Login to dPanel, open https://cloud-beta .terpusat.com/router, and delete existing domain" )
160+ logger .Error ("Login to dPanel, open https://cloud.terpusat.com/router, and delete existing domain" )
185161 return
186162 }
187163
0 commit comments