nginx · Dean-Coakley · Jan 22, 2021 · Jan 16, 2021 · Jan 22, 2021
diff --git a/docs-web/configuration/global-configuration/configmap-resource.md b/docs-web/configuration/global-configuration/configmap-resource.md
@@ -114,6 +114,10 @@ See the doc about [VirtualServer and VirtualServerRoute resources](/nginx-ingres
      - Enables or disables the `real_ip_recursive <https://nginx.org/en/docs/http/ngx_http_realip_module.html#real_ip_recursive>`_ directive.
      - ``False``
      - 
+   * - ``default-server-return``
+     - Configures the `return <https://nginx.org/en/docs/http/ngx_http_rewrite_module.html#return>`_  directive in the default server, which handles a client request if none of the hosts of Ingress or VirtualServer resources match. The default value configures NGINX to return a 404 error page. You can configure a fixed response or a redirect. For example, ``default-server-return: 302 https://nginx.org`` will redirect a client to ``https://nginx.org``.
+     - ``404``
+     -
    * - ``server-tokens``
      - Enables or disables the `server_tokens <https://nginx.org/en/docs/http/ngx_http_core_module.html#server_tokens>`_ directive. Additionally, with the NGINX Plus, you can specify a custom string value, including the empty string value, which disables the emission of the “Server” field.
      - ``True``

diff --git a/internal/configs/config_params.go b/internal/configs/config_params.go
@@ -7,6 +7,7 @@ import conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configurat
 type ConfigParams struct {
 	ClientMaxBodySize                      string
 	DefaultServerAccessLogOff              bool
+	DefaultServerReturn                    string
 	FailTimeout                            string
 	HealthCheckEnabled                     bool
 	HealthCheckMandatory                   bool
@@ -131,6 +132,7 @@ type Listener struct {
 // NewDefaultConfigParams creates a ConfigParams with default values.
 func NewDefaultConfigParams() *ConfigParams {
 	return &ConfigParams{
+		DefaultServerReturn:           "404",
 		ServerTokens:                  "on",
 		ProxyConnectTimeout:           "60s",
 		ProxyReadTimeout:              "60s",

diff --git a/internal/configs/configmaps.go b/internal/configs/configmaps.go
@@ -246,6 +246,10 @@ func ParseConfigMap(cfgm *v1.ConfigMap, nginxPlus bool, hasAppProtect bool) *Con
 		}
 	}
 
+	if defaultServerReturn, exists := cfgm.Data["default-server-return"]; exists {
+		cfgParams.DefaultServerReturn = defaultServerReturn
+	}
+
 	if proxyBuffering, exists, err := GetMapKeyAsBool(cfgm.Data, "proxy-buffering", cfgm); exists {
 		if err != nil {
 			glog.Error(err)
@@ -497,6 +501,7 @@ func GenerateNginxMainConfig(staticCfgParams *StaticConfigParams, config *Config
 	nginxCfg := &version1.MainConfig{
 		AccessLogOff:                       config.MainAccessLogOff,
 		DefaultServerAccessLogOff:          config.DefaultServerAccessLogOff,
+		DefaultServerReturn:                config.DefaultServerReturn,
 		ErrorLogLevel:                      config.MainErrorLogLevel,
 		HealthStatus:                       staticCfgParams.HealthStatus,
 		HealthStatusURI:                    staticCfgParams.HealthStatusURI,

diff --git a/internal/configs/version1/config.go b/internal/configs/version1/config.go
@@ -145,6 +145,7 @@ type Location struct {
 type MainConfig struct {
 	AccessLogOff                       bool
 	DefaultServerAccessLogOff          bool
+	DefaultServerReturn                string
 	ErrorLogLevel                      string
 	HealthStatus                       bool
 	HealthStatusURI                    string

diff --git a/internal/configs/version1/nginx-plus.tmpl b/internal/configs/version1/nginx-plus.tmpl
@@ -148,7 +148,7 @@ http {
         {{end}}
 
         location / {
-           return 404;
+            return {{.DefaultServerReturn}};
         }
     }
 

diff --git a/internal/configs/version1/nginx.tmpl b/internal/configs/version1/nginx.tmpl
@@ -133,7 +133,7 @@ http {
         {{end}}
 
         location / {
-           return 404;
+            return {{.DefaultServerReturn}};
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -148,7 +148,7 @@ http { @@
             {{end}}
             location / {
-               return 404;
+                return {{.DefaultServerReturn}};
             }
         }
@@ Expand Down @@