From 1419563c6a5a1c2dc54f2b87d308197536b21e55 Mon Sep 17 00:00:00 2001
From: KevinMidboe <kevin.midboe@gmail.com>
Date: Thu, 9 Nov 2023 22:11:54 +0100
Subject: [PATCH] Moved more_header nginx module into repo as submodule

---
 .drone.yml                                  | 26 +++++++++++++++------
 .gitmodules                                 |  3 +++
 modules-available/headers-more-nginx-module |  1 +
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 modules-available/headers-more-nginx-module

diff --git a/.drone.yml b/.drone.yml
index 2c4b3e0..d59809b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -13,6 +13,11 @@ environment:
   HEADERS_MORE_VERSION: 'v0.35'
 
 steps:
+  - name: submodules
+    image: alpine/git
+    commands:
+    - git submodule update --init --recursive
+
   - name: Verify nginx config
     image: ubuntu/nginx:1.24-23.10_beta
     commands:
@@ -21,19 +26,26 @@ steps:
   - name: Compile nginx
     image: ubuntu/nginx:1.24-23.10_beta
     commands:
+      - NGINX_CONFIG_PATH=$(pwd)
       - apt update
-      - apt install wget build-essential libpcre3 libpcre3-dev zlib1g zlib1g-dev libssl-dev -y
-      - mkdir -p /opt/nginx-modules
-      - wget "https://github.com/openresty/headers-more-nginx-module/archive/refs/tags/$${HEADERS_MORE_VERSION}.tar.gz"
-      - tar -xvzf $${HEADERS_MORE_VERSION}.tar.gz
-      - mv headers-more-nginx-module-* $${NGINX_MODULES_DIR}/headers-more-nginx-module
-      - mkdir -p /opt/nginx
+      - apt install -y
+        wget
+        build-essential
+        libpcre3
+        libpcre3-dev
+        zlib1g
+        zlib1g-dev
+        libssl-dev
+        tree
       - wget "http://nginx.org/download/nginx-$${NGINX_VERSION}.tar.gz"
       - tar -xvzf nginx-$${NGINX_VERSION}.tar.gz
       - cd nginx-$${NGINX_VERSION}
-      - ./configure --prefix=/opt/nginx --add-dynamic-module=$${NGINX_MODULES_DIR}/headers-more-nginx-module  --with-compat
+      - ./configure --prefix=/opt/nginx
+        --add-dynamic-module=../modules-available/headers-more-nginx-module
+        --with-compat
       - make
       - make install
+      - tree /opt/nginx
 
 ---
 kind: signature
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..657b89b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "modules-available/headers-more-nginx-module"]
+	path = modules-available/headers-more-nginx-module
+	url = https://github.com/openresty/headers-more-nginx-module
diff --git a/modules-available/headers-more-nginx-module b/modules-available/headers-more-nginx-module
new file mode 160000
index 0000000..db45361
--- /dev/null
+++ b/modules-available/headers-more-nginx-module
@@ -0,0 +1 @@
+Subproject commit db45361256a665e4e076465249628bb4631c3354