@@ -23,6 +23,7 @@ services:
|
|||||||
MONGO_URI: mongodb://mongo:27017/keymanager
|
MONGO_URI: mongodb://mongo:27017/keymanager
|
||||||
GITEA_HOST: ${GITEA_HOST}
|
GITEA_HOST: ${GITEA_HOST}
|
||||||
PUBLIC_HOST: ${PUBLIC_HOST}
|
PUBLIC_HOST: ${PUBLIC_HOST}
|
||||||
|
GRPC_HOST: ${GRPC_HOST}
|
||||||
GRPC_PORT: "9090"
|
GRPC_PORT: "9090"
|
||||||
HTTP_PORT: "8080"
|
HTTP_PORT: "8080"
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|||||||
@@ -210,6 +210,10 @@ func handleInstallScript(c *gin.Context) {
|
|||||||
if publicHost == "" {
|
if publicHost == "" {
|
||||||
publicHost = "keymanager.example.com"
|
publicHost = "keymanager.example.com"
|
||||||
}
|
}
|
||||||
|
grpcHost := os.Getenv("GRPC_HOST")
|
||||||
|
if grpcHost == "" {
|
||||||
|
grpcHost = publicHost
|
||||||
|
}
|
||||||
|
|
||||||
script := fmt.Sprintf(`#!/usr/bin/env bash
|
script := fmt.Sprintf(`#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
@@ -220,6 +224,9 @@ GITEA_HOST="%s"
|
|||||||
KM_HOST="%s"
|
KM_HOST="%s"
|
||||||
KM_HOST="${KM_HOST#https://}"
|
KM_HOST="${KM_HOST#https://}"
|
||||||
KM_HOST="${KM_HOST#http://}"
|
KM_HOST="${KM_HOST#http://}"
|
||||||
|
GRPC_HOST="%s"
|
||||||
|
GRPC_HOST="${GRPC_HOST#https://}"
|
||||||
|
GRPC_HOST="${GRPC_HOST#http://}"
|
||||||
|
|
||||||
ARCH=$(uname -m)
|
ARCH=$(uname -m)
|
||||||
case "$ARCH" in
|
case "$ARCH" in
|
||||||
@@ -261,7 +268,7 @@ mkdir -p /etc/keymanager
|
|||||||
chmod 0700 /etc/keymanager
|
chmod 0700 /etc/keymanager
|
||||||
|
|
||||||
cat > /etc/keymanager/config.yaml <<EOF
|
cat > /etc/keymanager/config.yaml <<EOF
|
||||||
server_url: "${KM_HOST}:9090"
|
server_url: "${GRPC_HOST}"
|
||||||
server_id: "${SERVER_ID}"
|
server_id: "${SERVER_ID}"
|
||||||
pre_reg_token: "${TOKEN}"
|
pre_reg_token: "${TOKEN}"
|
||||||
agent_token: ""
|
agent_token: ""
|
||||||
@@ -289,7 +296,7 @@ systemctl daemon-reload
|
|||||||
systemctl enable --now keymanager-agent
|
systemctl enable --now keymanager-agent
|
||||||
|
|
||||||
echo "keymanager-agent installed and started."
|
echo "keymanager-agent installed and started."
|
||||||
`, serverID, token, giteaHost, publicHost)
|
`, serverID, token, giteaHost, publicHost, grpcHost)
|
||||||
|
|
||||||
c.Header("Content-Type", "text/x-shellscript")
|
c.Header("Content-Type", "text/x-shellscript")
|
||||||
c.String(http.StatusOK, script)
|
c.String(http.StatusOK, script)
|
||||||
|
|||||||
Reference in New Issue
Block a user