Rosti/node-api
3
0
Fork 0
Code Issues 2 Pull Requests Actions Projects Releases 12 Wiki Activity

Prefix to deploy keys
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Adam Štrauch 2023-04-14 19:22:10 +02:00
parent 4c2bcdd3e7
commit d465421fa0
Signed by: cx
GPG Key ID: 018304FFA8988F8D
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
containers/types.go
View File

@ -16,7 +16,8 @@ import (
// username in the containers under which all containers run // username in the containers under which all containers run
const appUsername = "app" const appUsername = "app"
const passwordFile = "/srv/.rosti" const passwordFile = "/srv/.rosti"
const keyType = "ed25519" const deployKeyType = "ed25519"
const deployKeyPrefix = "rosti_deploy"
// Process contains info about background application usually running in supervisor // Process contains info about background application usually running in supervisor
type Process struct { type Process struct {
@ -248,7 +249,7 @@ func (c *Container) GenerateDeploySSHKeys() (bool, error) {
return false, err return false, err
} }
_, err = driver.Exec(c.App.Name, []string{"ssh-keygen", "-t", keyType, "-f", "/srv/.ssh/id_" + keyType, "-P", ""}, "", []string{}, true) _, err = driver.Exec(c.App.Name, []string{"ssh-keygen", "-t", deployKeyType, "-f", "/srv/.ssh/" + deployKeyPrefix + "_id_" + deployKeyType, "-P", ""}, "", []string{}, true)
if err != nil { if err != nil {
return false, err return false, err
} }
@ -266,11 +267,11 @@ func (c *Container) GenerateDeploySSHKeys() (bool, error) {
func (c *Container) GetDeploySSHKeys() (string, string, error) { func (c *Container) GetDeploySSHKeys() (string, string, error) {
driver := c.getDriver() driver := c.getDriver()
privateKey, err := driver.Exec(c.App.Name, []string{"cat", "/srv/.ssh/id_" + keyType}, "", []string{}, true) privateKey, err := driver.Exec(c.App.Name, []string{"cat", "/srv/.ssh/" + deployKeyPrefix + "_id_" + deployKeyType}, "", []string{}, true)
if err != nil { if err != nil {
return "", "", err return "", "", err
} }
pubKey, err := driver.Exec(c.App.Name, []string{"cat", "/srv/.ssh/id_" + keyType + ".pub"}, "", []string{}, true) pubKey, err := driver.Exec(c.App.Name, []string{"cat", "/srv/.ssh/" + deployKeyPrefix + "_id_" + deployKeyType + ".pub"}, "", []string{}, true)
if err != nil { if err != nil {
return "", "", err return "", "", err
} }