From d597c592271255fbec719c763d94c318f23f3408 Mon Sep 17 00:00:00 2001 From: Lukasz Szemis Date: Thu, 11 Jan 2024 15:09:29 +0100 Subject: [PATCH 1/6] add nginx stub module to nginx, part of SRE o11y project --- context/nginx/conf.d/stub.conf.tmpl | 11 +++++++++++ generator/index.php | 4 ++++ .../src/templates/nginx/conf.d/stub.default.conf.twig | 11 +++++++++++ 3 files changed, 26 insertions(+) create mode 100644 context/nginx/conf.d/stub.conf.tmpl create mode 100644 generator/src/templates/nginx/conf.d/stub.default.conf.twig diff --git a/context/nginx/conf.d/stub.conf.tmpl b/context/nginx/conf.d/stub.conf.tmpl new file mode 100644 index 000000000..0f8255c46 --- /dev/null +++ b/context/nginx/conf.d/stub.conf.tmpl @@ -0,0 +1,11 @@ +server { + server_name localhost; + listen 80; + access_log off; + + location /nginx_status { + stub_status; + allow 127.0.0.1; + deny all; + } +} diff --git a/generator/index.php b/generator/index.php index c10fe67f2..ae382e611 100644 --- a/generator/index.php +++ b/generator/index.php @@ -500,6 +500,10 @@ static function ($endpoint) use ($projectData) { $deploymentDir . DS . 'context' . DS . 'nginx' . DS . 'conf.d' . DS . 'debug.default.conf', $twig->render('nginx/conf.d/debug.default.conf.twig', $projectData) ); +file_put_contents( + $deploymentDir . DS . 'context' . DS . 'nginx' . DS . 'stub.default.conf', + $twig->render('nginx/conf.d/stub.default.cong.twig', $projectData) +); file_put_contents( $deploymentDir . DS . 'context' . DS . 'nginx' . DS . 'entrypoint.sh', $twig->render('nginx/entrypoint.sh.twig', $projectData) diff --git a/generator/src/templates/nginx/conf.d/stub.default.conf.twig b/generator/src/templates/nginx/conf.d/stub.default.conf.twig new file mode 100644 index 000000000..c08bfac89 --- /dev/null +++ b/generator/src/templates/nginx/conf.d/stub.default.conf.twig @@ -0,0 +1,11 @@ +server { + server_name localhost; + listen 80; + access_log off; + + location /nginx_status { + stub_status; + allow 127.0.0.1; + deny all; + } +} \ No newline at end of file From c480f35973b70c5775ecf1e0d4c65840f95c45f0 Mon Sep 17 00:00:00 2001 From: Lukasz Szemis Date: Thu, 11 Jan 2024 15:10:30 +0100 Subject: [PATCH 2/6] add nginx stub module to nginx, part of SRE o11y project --- context/nginx/conf.d/{stub.conf.tmpl => stub.default.conf.tmpl} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename context/nginx/conf.d/{stub.conf.tmpl => stub.default.conf.tmpl} (100%) diff --git a/context/nginx/conf.d/stub.conf.tmpl b/context/nginx/conf.d/stub.default.conf.tmpl similarity index 100% rename from context/nginx/conf.d/stub.conf.tmpl rename to context/nginx/conf.d/stub.default.conf.tmpl From e716ed51dd1f69b50f7a0595df04d9992c03c3cf Mon Sep 17 00:00:00 2001 From: Lukasz Szemis Date: Thu, 11 Jan 2024 16:19:50 +0100 Subject: [PATCH 3/6] typo and filename fix --- context/nginx/conf.d/stub.default.conf.tmpl | 11 ----------- generator/index.php | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 context/nginx/conf.d/stub.default.conf.tmpl diff --git a/context/nginx/conf.d/stub.default.conf.tmpl b/context/nginx/conf.d/stub.default.conf.tmpl deleted file mode 100644 index 0f8255c46..000000000 --- a/context/nginx/conf.d/stub.default.conf.tmpl +++ /dev/null @@ -1,11 +0,0 @@ -server { - server_name localhost; - listen 80; - access_log off; - - location /nginx_status { - stub_status; - allow 127.0.0.1; - deny all; - } -} diff --git a/generator/index.php b/generator/index.php index ae382e611..4eb7b10e6 100644 --- a/generator/index.php +++ b/generator/index.php @@ -502,7 +502,7 @@ static function ($endpoint) use ($projectData) { ); file_put_contents( $deploymentDir . DS . 'context' . DS . 'nginx' . DS . 'stub.default.conf', - $twig->render('nginx/conf.d/stub.default.cong.twig', $projectData) + $twig->render('nginx/conf.d/stub.default.conf.twig', $projectData) ); file_put_contents( $deploymentDir . DS . 'context' . DS . 'nginx' . DS . 'entrypoint.sh', From 5359c81880bb79e74911d854c5c426106d60f039 Mon Sep 17 00:00:00 2001 From: Lukasz Szemis Date: Thu, 11 Jan 2024 16:35:17 +0100 Subject: [PATCH 4/6] changes --- context/nginx/conf.d/stub.default.conf | 11 +++++++++++ images/common/frontend/Dockerfile | 1 + 2 files changed, 12 insertions(+) create mode 100644 context/nginx/conf.d/stub.default.conf diff --git a/context/nginx/conf.d/stub.default.conf b/context/nginx/conf.d/stub.default.conf new file mode 100644 index 000000000..0f8255c46 --- /dev/null +++ b/context/nginx/conf.d/stub.default.conf @@ -0,0 +1,11 @@ +server { + server_name localhost; + listen 80; + access_log off; + + location /nginx_status { + stub_status; + allow 127.0.0.1; + deny all; + } +} diff --git a/images/common/frontend/Dockerfile b/images/common/frontend/Dockerfile index 1a9cab66d..22ff10786 100644 --- a/images/common/frontend/Dockerfile +++ b/images/common/frontend/Dockerfile @@ -8,6 +8,7 @@ RUN mkdir -p /etc/nginx/template/ && chmod 0777 /etc/nginx/template/ COPY --chown=root:root nginx/nginx.original.conf /etc/nginx/nginx.conf COPY --chown=root:root nginx/conf.d/frontend.default.conf.tmpl /etc/nginx/template/default.conf.tmpl COPY --chown=root:root nginx/conf.d/resolver.conf.tmpl /etc/nginx/template/resolver.conf.tmpl +COPY --chown=root:root nginx/conf.d/stub.default.conf.tmpl /etc/nginx/conf.d/stub.conf COPY --chown=root:root nginx/auth /etc/nginx/auth COPY --chown=root:root nginx/entrypoint.sh / RUN chmod +x /entrypoint.sh From 406263c92762fe3c2e082b9d45ad9de32f34891c Mon Sep 17 00:00:00 2001 From: Lukasz Szemis Date: Thu, 11 Jan 2024 17:40:21 +0100 Subject: [PATCH 5/6] enabling nginx-stub module in docker-sdk --- generator/src/templates/nginx/conf.d/stub.default.conf.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/src/templates/nginx/conf.d/stub.default.conf.twig b/generator/src/templates/nginx/conf.d/stub.default.conf.twig index c08bfac89..0f8255c46 100644 --- a/generator/src/templates/nginx/conf.d/stub.default.conf.twig +++ b/generator/src/templates/nginx/conf.d/stub.default.conf.twig @@ -8,4 +8,4 @@ server { allow 127.0.0.1; deny all; } -} \ No newline at end of file +} From 8613cad64b452b37dcaff67b9b3ee0a4ea9cdacf Mon Sep 17 00:00:00 2001 From: Lukasz Szemis Date: Fri, 12 Jan 2024 09:13:28 +0100 Subject: [PATCH 6/6] test --- context/nginx/conf.d/stub.default.conf.tmpl | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 context/nginx/conf.d/stub.default.conf.tmpl diff --git a/context/nginx/conf.d/stub.default.conf.tmpl b/context/nginx/conf.d/stub.default.conf.tmpl new file mode 100644 index 000000000..0f8255c46 --- /dev/null +++ b/context/nginx/conf.d/stub.default.conf.tmpl @@ -0,0 +1,11 @@ +server { + server_name localhost; + listen 80; + access_log off; + + location /nginx_status { + stub_status; + allow 127.0.0.1; + deny all; + } +}