nginx: separate ngx_http_perl_module build

Isolates the Perl module build step to ensure that other modules
do not require perl to be installed, reducing dependencies for
standard builds.

Author: chinkung

nginx-mainline.yaml

@@ -3,7 +3,7 @@ package:
   # MAINLINE VERSIONS MUST USE ODD MINOR VERSIONS (e.g., 1.27.x, 1.29.x)
   # Must also bump njs at the same time
   version: "1.29.5"
-  epoch: 1 # go/wolfi-rsc/nginx-mainline
+  epoch: 0 # go/wolfi-rsc/nginx-mainline
   # HEY YOU! If you update/bump this package you NEED to go and update the equivilent nginx-otel package
   description: HTTP and reverse proxy server (mainline version)
   copyright:
@@ -53,8 +53,8 @@ data:
   - name: modules
     items:
       http_geoip: "10"
+      http_headers_more_filter: "10"
       http_image_filter: "10"
-      http_perl: "10"
       http_xslt_filter: "10"
       mail: "10"
       stream_geoip: "10"
@@ -361,21 +361,22 @@ subpackages:
         - wolfi-baselayout
 
   - range: modules
-    name: nginx-mainline-mod-${{range.key}}
+    name: ${{package.name}}-mod-${{range.key}}
     description: Nginx third-party module ${{range.key}}
     dependencies:
       provides:
         - nginx-mod-${{range.key}}=${{package.full-version}}
       runtime:
         - merged-usrsbin
-        - perl-dev
+        - ${{package.name}}
         - wolfi-baselayout
     pipeline:
       - runs: |
-          mkdir -p ${{targets.subpkgdir}}/usr/lib/nginx/modules
-          mkdir -p ${{targets.subpkgdir}}/etc/nginx/modules
           # --modules-path is only used for installing modules, not loading them
-          mkdir -p ${{targets.subpkgdir}}/var/lib/nginx/
+          install -d -m 755 \
+            ${{targets.subpkgdir}}/usr/lib/nginx/modules \
+            ${{targets.subpkgdir}}/etc/nginx/modules \
+            ${{targets.subpkgdir}}/var/lib/nginx
           ln -sf /usr/lib/nginx/modules ${{targets.subpkgdir}}/var/lib/nginx/modules
 
           mv ${{targets.destdir}}/usr/lib/nginx/modules/ngx_${{range.key}}_module.so ${{targets.subpkgdir}}/usr/lib/nginx/modules/
@@ -384,13 +385,6 @@ subpackages:
           echo "load_module \"modules/ngx_${{range.key}}_module.so\";" >> ${{targets.subpkgdir}}/etc/nginx/modules/${{range.value}}_${{range.key}}.conf
 
           case ${{range.key}} in
-            http_perl)
-              mv ${{targets.destdir}}/usr/lib/perl5 ${{targets.subpkgdir}}/usr/lib/
-            ;;
-            http_naxsi)
-              install -m644 -D naxsi-*/naxsi_config/naxsi_core.rules \
-                ${{targets.subpkgdir}}/etc/nginx/naxsi_core.rules
-            ;;
             stream)
               mkdir -p ${{targets.subpkgdir}}/etc/nginx/stream.d
               install -m644 -D stream.conf ${{targets.subpkgdir}}/etc/nginx/stream.d/
@@ -400,6 +394,34 @@ subpackages:
       pipeline:
         - uses: test/tw/ldd-check
 
+  - name: ${{package.name}}-mod-http_perl
+    description: Nginx third-party module http_perl
+    dependencies:
+      provides:
+        - nginx-mod-http_perl=${{package.full-version}}
+      runtime:
+        - merged-usrsbin
+        - ${{package.name}}
+        - perl
+        - wolfi-baselayout
+    pipeline:
+      - runs: |
+          install -d -m 755 \
+            ${{targets.subpkgdir}}/usr/lib/nginx/modules \
+            ${{targets.subpkgdir}}/etc/nginx/modules \
+            ${{targets.subpkgdir}}/var/lib/nginx
+
+          ln -sf /usr/lib/nginx/modules ${{targets.subpkgdir}}/var/lib/nginx/modules
+
+          mv ${{targets.destdir}}/usr/lib/nginx/modules/ngx_http_perl_module.so ${{targets.subpkgdir}}/usr/lib/nginx/modules/
+
+          mv ${{targets.destdir}}/usr/lib/perl5 ${{targets.subpkgdir}}/usr/lib/
+
+          echo "load_module \"modules/ngx_http_perl_module.so\";" >> ${{targets.subpkgdir}}/etc/nginx/modules/10_http_perl.conf
+    test:
+      pipeline:
+        - uses: test/tw/ldd-check
+
   - name: nginx-mainline-src
     description: Nginx source code
     dependencies:
@@ -437,31 +459,6 @@ subpackages:
         - runs: |
             readlink -v /etc/nginx/conf.d/default.conf
 
-  - name: ${{package.name}}-mod-http_headers_more_filter
-    description: Nginx third-party module http_headers_more_filter
-    dependencies:
-      provides:
-        - nginx-mod-http_headers_more_filter=${{package.full-version}}
-      runtime:
-        - merged-usrsbin
-        - ${{package.name}}
-        - wolfi-baselayout
-    pipeline:
-      - runs: |
-          install -d -m 755 \
-            ${{targets.subpkgdir}}/usr/lib/nginx/modules \
-            ${{targets.subpkgdir}}/etc/nginx/modules \
-            ${{targets.subpkgdir}}/var/lib/nginx
-
-          ln -sf /usr/lib/nginx/modules ${{targets.subpkgdir}}/var/lib/nginx/modules
-
-          mv ${{targets.destdir}}/usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so ${{targets.subpkgdir}}/usr/lib/nginx/modules/
-
-          echo "load_module \"modules/ngx_http_headers_more_filter_module.so\";" >> ${{targets.subpkgdir}}/etc/nginx/modules/10_http_headers_more_filter.conf
-    test:
-      pipeline:
-        - uses: test/tw/ldd-check
-
 test:
   environment:
     accounts:

nginx-stable.yaml

@@ -52,8 +52,8 @@ data:
   - name: modules
     items:
       http_geoip: "10"
+      http_headers_more_filter: "10"
       http_image_filter: "10"
-      http_perl: "10"
       http_xslt_filter: "10"
       mail: "10"
       stream_geoip: "10"
@@ -356,14 +356,15 @@ subpackages:
         - nginx-mod-${{range.key}}=${{package.full-version}}
       runtime:
         - merged-usrsbin
-        - perl-dev
+        - ${{package.name}}
         - wolfi-baselayout
     pipeline:
       - runs: |
-          mkdir -p ${{targets.subpkgdir}}/usr/lib/nginx/modules
-          mkdir -p ${{targets.subpkgdir}}/etc/nginx/modules
           # --modules-path is only used for installing modules, not loading them
-          mkdir -p ${{targets.subpkgdir}}/var/lib/nginx/
+          install -d -m 755 \
+            ${{targets.subpkgdir}}/usr/lib/nginx/modules \
+            ${{targets.subpkgdir}}/etc/nginx/modules \
+            ${{targets.subpkgdir}}/var/lib/nginx
           ln -sf /usr/lib/nginx/modules ${{targets.subpkgdir}}/var/lib/nginx/modules
 
           mv ${{targets.destdir}}/usr/lib/nginx/modules/ngx_${{range.key}}_module.so ${{targets.subpkgdir}}/usr/lib/nginx/modules/
@@ -372,13 +373,6 @@ subpackages:
           echo "load_module \"modules/ngx_${{range.key}}_module.so\";" >> ${{targets.subpkgdir}}/etc/nginx/modules/${{range.value}}_${{range.key}}.conf
 
           case ${{range.key}} in
-            http_perl)
-              mv ${{targets.destdir}}/usr/lib/perl5 ${{targets.subpkgdir}}/usr/lib/
-            ;;
-            http_naxsi)
-              install -m644 -D naxsi-*/naxsi_config/naxsi_core.rules \
-                ${{targets.subpkgdir}}/etc/nginx/naxsi_core.rules
-            ;;
             stream)
               mkdir -p ${{targets.subpkgdir}}/etc/nginx/stream.d
               install -m644 -D stream.conf ${{targets.subpkgdir}}/etc/nginx/stream.d/
@@ -388,6 +382,34 @@ subpackages:
       pipeline:
         - uses: test/tw/ldd-check
 
+  - name: ${{package.name}}-mod-http_perl
+    description: Nginx third-party module http_perl
+    dependencies:
+      provides:
+        - nginx-mod-http_perl=${{package.full-version}}
+      runtime:
+        - merged-usrsbin
+        - ${{package.name}}
+        - perl
+        - wolfi-baselayout
+    pipeline:
+      - runs: |
+          install -d -m 755 \
+            ${{targets.subpkgdir}}/usr/lib/nginx/modules \
+            ${{targets.subpkgdir}}/etc/nginx/modules \
+            ${{targets.subpkgdir}}/var/lib/nginx
+
+          ln -sf /usr/lib/nginx/modules ${{targets.subpkgdir}}/var/lib/nginx/modules
+
+          mv ${{targets.destdir}}/usr/lib/nginx/modules/ngx_http_perl_module.so ${{targets.subpkgdir}}/usr/lib/nginx/modules/
+
+          mv ${{targets.destdir}}/usr/lib/perl5 ${{targets.subpkgdir}}/usr/lib/
+
+          echo "load_module \"modules/ngx_http_perl_module.so\";" >> ${{targets.subpkgdir}}/etc/nginx/modules/10_http_perl.conf
+    test:
+      pipeline:
+        - uses: test/tw/ldd-check
+
   - name: ${{package.name}}-src
     description: Nginx source code
     dependencies:
@@ -424,31 +446,6 @@ subpackages:
         - runs: |
             readlink -v /etc/nginx/conf.d/default.conf
 
-  - name: ${{package.name}}-mod-http_headers_more_filter
-    description: Nginx third-party module http_headers_more_filter
-    dependencies:
-      provides:
-        - nginx-mod-http_headers_more_filter=${{package.full-version}}
-      runtime:
-        - merged-usrsbin
-        - ${{package.name}}
-        - wolfi-baselayout
-    pipeline:
-      - runs: |
-          install -d -m 755 \
-            ${{targets.subpkgdir}}/usr/lib/nginx/modules \
-            ${{targets.subpkgdir}}/etc/nginx/modules \
-            ${{targets.subpkgdir}}/var/lib/nginx
-
-          ln -sf /usr/lib/nginx/modules ${{targets.subpkgdir}}/var/lib/nginx/modules
-
-          mv ${{targets.destdir}}/usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so ${{targets.subpkgdir}}/usr/lib/nginx/modules/
-
-          echo "load_module \"modules/ngx_http_headers_more_filter_module.so\";" >> ${{targets.subpkgdir}}/etc/nginx/modules/10_http_headers_more_filter.conf
-    test:
-      pipeline:
-        - uses: test/tw/ldd-check
-
 test:
   environment:
     contents: