|
|
@@ -6,14 +6,26 @@ import (
|
|
|
"encoding/json"
|
|
|
"net/http"
|
|
|
log "gopkg.in/clog.v1"
|
|
|
+ "fmt"
|
|
|
)
|
|
|
|
|
|
type CliCongig struct {
|
|
|
RsaHostKey string
|
|
|
}
|
|
|
-
|
|
|
+type ApiCliConfig struct {
|
|
|
+ RSAKet string
|
|
|
+ Weburl string
|
|
|
+ Webport string
|
|
|
+ SSHUrl string
|
|
|
+ SSHUser string
|
|
|
+ SSHPort int
|
|
|
+}
|
|
|
func ClientC(c *context.APIContext) {
|
|
|
- data, err := json.Marshal(setting.CliConfig)
|
|
|
+ cf := ApiCliConfig{RSAKet: setting.CliConfig.RsaHostKey,
|
|
|
+ Weburl: fmt.Sprintf("%s://%s", setting.Protocol, setting.Domain),
|
|
|
+ Webport: setting.HTTPPort, SSHUrl: setting.SSH.Domain, SSHPort: setting.SSH.Port,
|
|
|
+ SSHUser: setting.RunUser}
|
|
|
+ data, err := json.Marshal(cf)
|
|
|
if err != nil {
|
|
|
log.Info("Copuld not determine client congig: %+v", err)
|
|
|
c.WriteHeader(http.StatusInternalServerError)
|
cgars