refactor: rename port-map property to port
This commit is contained in:
@@ -23,7 +23,7 @@ func addPortMaps(appName string, portMaps []PortMap) error {
|
||||
}
|
||||
|
||||
func clearPorts(appName string) error {
|
||||
return common.PropertyDelete("ports", appName, "port-map")
|
||||
return common.PropertyDelete("ports", appName, "map")
|
||||
}
|
||||
|
||||
func doesCertExist(appName string) bool {
|
||||
@@ -115,7 +115,7 @@ func getGlobalProxySSLPort() int {
|
||||
}
|
||||
|
||||
func getPortMaps(appName string) []PortMap {
|
||||
value, err := common.PropertyListGet("ports", appName, "port-map")
|
||||
value, err := common.PropertyListGet("ports", appName, "map")
|
||||
if err != nil {
|
||||
return []PortMap{}
|
||||
}
|
||||
@@ -364,7 +364,7 @@ func removePortMaps(appName string, portMaps []PortMap) error {
|
||||
}
|
||||
|
||||
if len(toSet) == 0 {
|
||||
return common.PropertyDelete("ports", appName, "port-map")
|
||||
return common.PropertyDelete("ports", appName, "map")
|
||||
}
|
||||
|
||||
return setPortMaps(appName, toSet)
|
||||
@@ -381,7 +381,7 @@ func setPortMaps(appName string, portMaps []PortMap) error {
|
||||
}
|
||||
|
||||
sort.Strings(value)
|
||||
return common.PropertyListWrite("ports", appName, "port-map", value)
|
||||
return common.PropertyListWrite("ports", appName, "map", value)
|
||||
}
|
||||
|
||||
func setProxyPort(appName string, port int) error {
|
||||
|
||||
@@ -19,11 +19,11 @@ func TriggerInstall() error {
|
||||
}
|
||||
|
||||
for _, appName := range apps {
|
||||
if common.PropertyExists("ports", appName, "port-map") {
|
||||
if common.PropertyExists("ports", appName, "map") {
|
||||
continue
|
||||
}
|
||||
|
||||
common.LogInfo1(fmt.Sprintf("Migrating DOKKU_PROXY_PORT_MAP to port-map property for %s", appName))
|
||||
common.LogInfo1(fmt.Sprintf("Migrating DOKKU_PROXY_PORT_MAP to ports map property for %s", appName))
|
||||
portMapString := config.GetWithDefault(appName, "DOKKU_PROXY_PORT_MAP", "")
|
||||
portMaps, _ := parsePortMapString(portMapString)
|
||||
|
||||
@@ -32,7 +32,7 @@ func TriggerInstall() error {
|
||||
propertyValue = append(propertyValue, portMap.String())
|
||||
}
|
||||
|
||||
if err := common.PropertyListWrite("ports", appName, "port-map", propertyValue); err != nil {
|
||||
if err := common.PropertyListWrite("ports", appName, "map", propertyValue); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user