github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: rename port-map property to port

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2023-07-16 02:30:44 -04:00
parent f842869c3d
commit b44be8def9
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/networking/proxies/nginx.md
View File

@@ -376,8 +376,8 @@ Unsetting this value is the same as enabling custom nginx config usage.
{{ .PROXY_PORT }} Non-SSL nginx listener port (same as `DOKKU_PROXY_PORT` config var) {{ .PROXY_PORT }} Non-SSL nginx listener port (same as `DOKKU_PROXY_PORT` config var)
{{ .PROXY_SSL_PORT }} SSL nginx listener port (same as `DOKKU_PROXY_SSL_PORT` config var) {{ .PROXY_SSL_PORT }} SSL nginx listener port (same as `DOKKU_PROXY_SSL_PORT` config var)
{{ .NOSSL_SERVER_NAME }} List of non-SSL VHOSTS {{ .NOSSL_SERVER_NAME }} List of non-SSL VHOSTS
{{ .PROXY_PORT_MAP }} List of port mappings (same as the `port-map` ports property) {{ .PROXY_PORT_MAP }} List of port mappings (same as the `map` ports property)
{{ .PROXY_UPSTREAM_PORTS }} List of configured upstream ports (derived from the `port-map` ports property) {{ .PROXY_UPSTREAM_PORTS }} List of configured upstream ports (derived from the `map` ports property)
{{ .RAW_TCP_PORTS }} List of exposed tcp ports as defined by Dockerfile `EXPOSE` directive (**Dockerfile apps only**) {{ .RAW_TCP_PORTS }} List of exposed tcp ports as defined by Dockerfile `EXPOSE` directive (**Dockerfile apps only**)
{{ .SSL_INUSE }} Boolean set when an app is SSL-enabled {{ .SSL_INUSE }} Boolean set when an app is SSL-enabled
{{ .SSL_SERVER_NAME }} List of SSL VHOSTS {{ .SSL_SERVER_NAME }} List of SSL VHOSTS

8
plugins/ports/functions.go
View File

@@ -23,7 +23,7 @@ func addPortMaps(appName string, portMaps []PortMap) error {
} }
func clearPorts(appName string) error { func clearPorts(appName string) error {
return common.PropertyDelete("ports", appName, "port-map") return common.PropertyDelete("ports", appName, "map")
} }
func doesCertExist(appName string) bool { func doesCertExist(appName string) bool {
@@ -115,7 +115,7 @@ func getGlobalProxySSLPort() int {
} }
func getPortMaps(appName string) []PortMap { func getPortMaps(appName string) []PortMap {
value, err := common.PropertyListGet("ports", appName, "port-map") value, err := common.PropertyListGet("ports", appName, "map")
if err != nil { if err != nil {
return []PortMap{} return []PortMap{}
} }
@@ -364,7 +364,7 @@ func removePortMaps(appName string, portMaps []PortMap) error {
} }
if len(toSet) == 0 { if len(toSet) == 0 {
return common.PropertyDelete("ports", appName, "port-map") return common.PropertyDelete("ports", appName, "map")
} }
return setPortMaps(appName, toSet) return setPortMaps(appName, toSet)
@@ -381,7 +381,7 @@ func setPortMaps(appName string, portMaps []PortMap) error {
} }
sort.Strings(value) 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 { func setProxyPort(appName string, port int) error {

6
plugins/ports/triggers.go
View File

@@ -19,11 +19,11 @@ func TriggerInstall() error {
} }
for _, appName := range apps { for _, appName := range apps {
if common.PropertyExists("ports", appName, "port-map") { if common.PropertyExists("ports", appName, "map") {
continue 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", "") portMapString := config.GetWithDefault(appName, "DOKKU_PROXY_PORT_MAP", "")
portMaps, _ := parsePortMapString(portMapString) portMaps, _ := parsePortMapString(portMapString)
@@ -32,7 +32,7 @@ func TriggerInstall() error {
propertyValue = append(propertyValue, portMap.String()) 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 return err
} }