Merge branch 'release/v1.28.0-2'

Author: l-friebe

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.28.0-2] - 2025-06-17
+### Fixed
+- [#127] Include default configuration for ces-exporter access in maintenance mode
+
 ## [v1.28.0-1] - 2025-06-10
 ### Changed
 - [#125] Upgrade nginx to v1.28.0

Dockerfile

@@ -2,7 +2,7 @@ FROM node:lts-alpine as templating
 
 ENV WORKDIR=/template \
     # Used in template to invalidate caches - do not remove. The release script will auto update this line
-    VERSION="1.28.0-1"
+    VERSION="1.28.0-2"
 
 RUN mkdir -p ${WORKDIR}
 WORKDIR ${WORKDIR}
@@ -68,11 +68,11 @@ RUN wget --progress=bar:force:noscroll -O /tmp/warp.zip https://github.com/cloud
 FROM registry.cloudogu.com/official/base:3.22.0-2
 LABEL maintainer="hello@cloudogu.com" \
       NAME="official/nginx" \
-      VERSION="1.28.0-1"
+      VERSION="1.28.0-2"
 
 ENV CES_MAINTENANCE_MODE=false \
     # Used in template to invalidate caches - do not remove. The release script will auto update this line
-    VERSION="1.28.0-1"
+    VERSION="1.28.0-2"
 
 RUN set -x -o errexit \
  && set -o nounset \

docs/gui/release_notes_de.md

@@ -6,6 +6,9 @@ Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https
 
 ## [Unreleased]
 
+## [v1.28.0-2] - 2025-06-17
+- Wir haben nur technische Änderungen vorgenommen. Näheres finden Sie in den Changelogs.
+
 ## [v1.28.0-1] - 2025-06-10
 - Wir haben nur technische Änderungen vorgenommen. Näheres finden Sie in den Changelogs.
 

docs/gui/release_notes_en.md

@@ -6,6 +6,9 @@ Technical details on a release can be found in the corresponding [Changelog](htt
 
 ## [Unreleased]
 
+## [v1.28.0-2] - 2025-06-17
+- We have only made technical changes. You can find more details in the changelogs.
+
 ## [v1.28.0-1] - 2025-06-10
 - We have only made technical changes. You can find more details in the changelogs.
 

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/nginx",
-  "Version": "1.28.0-1",
+  "Version": "1.28.0-2",
   "DisplayName": "Nginx",
   "Description": "Nginx WebServer.",
   "Logo": "https://cloudogu.com/images/dogus/nginx.png",

resources/etc/ces-confd/templates/app.conf.tpl

@@ -1,3 +1,18 @@
+{{define "service-block"}}
+    location /{{.Location}} {
+    {{if eq .HealthStatus "healthy" "" }}
+        {{ if .Rewrite }}
+            rewrite ^/{{ .Rewrite.Pattern }}(/|$)(.*) {{ .Rewrite.Rewrite }}/$2 break;
+        {{end}}
+        {{ if eq .ProxyBuffering "off" }}proxy_buffering off;{{ end }}
+        proxy_pass {{.URL}};
+    {{else}}
+        error_page 503 /errors/starting.html;
+        return 503;
+    {{end}}
+    }
+{{end}}
+
 server {
   include /etc/nginx/include.d/ssl.conf;
   include /etc/nginx/include.d/errors.conf;
@@ -6,29 +21,6 @@ server {
   include /etc/nginx/include.d/robots.conf;
   include /etc/nginx/app.conf.d/*.conf;
 
-{{if .Maintenance}}
-    {{range .Services}}
-        {{if eq .Location "ces-exporter" }}
-            # allow ces-exporter access in maintenance mode
-            location /{{.Location}} {
-                {{ if .Rewrite }}
-                    rewrite ^/{{ .Rewrite.Pattern }}(/|$)(.*) {{ .Rewrite.Rewrite }}/$2 break;
-                {{end}}
-
-                {{ if eq .ProxyBuffering "off" }}
-                    proxy_buffering off;
-                {{ end }}
-
-                proxy_pass {{.URL}};
-            }
-        {{end}}
-    {{end}}
-
-    location / {
-    return 503;
-    }
-{{else}}
-
   # default proxy settings
   proxy_set_header Host $http_host;
   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -47,29 +39,31 @@ server {
 
   proxy_read_timeout 1d;
 
-
   # disable gzip encoding for proxy applications
   proxy_set_header Accept-Encoding identity;
 
+{{if .Maintenance}}
+    {{range .Services}}
+        {{if eq .Location "ces-exporter" }}
+            # allow ces-exporter access in maintenance mode
+            {{template "service-block" .}}
+        {{end}}
+    {{end}}
+
+    # show 503 for all other services in maintenance mode
+    location / {
+      return 503;
+    }
+{{else}}
+
   include /etc/nginx/include.d/info.conf;
   include /etc/nginx/include.d/subfilters.conf;
   include /etc/nginx/include.d/default-dogu.conf;
   include /etc/nginx/include.d/customhtml.conf;
 
   # services
   {{range .Services}}
-    location /{{.Location}} {
-      {{if eq .HealthStatus "healthy" "" }}
-        {{ if .Rewrite }}
-        rewrite ^/{{ .Rewrite.Pattern }}(/|$)(.*) {{ .Rewrite.Rewrite }}/$2 break;
-        {{end}}
-        {{ if eq .ProxyBuffering "off" }}proxy_buffering off;{{ end }}
-        proxy_pass {{.URL}};
-      {{else}}
-        error_page 503 /errors/starting.html;
-        return 503;
-      {{end}}
-    }
+      {{template "service-block" .}}
   {{end}}
   # end of services