Add a link for modules to nginx package (#54527)

Nginx does not use the --module-path when loading modules... It uses the
--prefix directory.

Rather than move the modules from /usr/lib/nginx to /var/lib/nginx, I
made a symlink. Maybe we should just move them but that feels like it
could have knock on consequences.

---------

Signed-off-by: MAx Allan <max.allan@chainguard.dev>

Author: max-allan-cgr

nginx-mainline.yaml

@@ -204,6 +204,9 @@ subpackages:
       - 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/
+          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/
 
@@ -261,21 +264,24 @@ subpackages:
 
 test:
   environment:
+    accounts:
+      users:
+        - username: nginx
+          uid: 65532
+      groups:
+        - groupname: nginx
+          gid: 65532
     contents:
       packages:
         - ${{package.name}}-config
         - ${{package.name}}-config-compat
+        - ${{package.name}}-mod-stream
         - curl
   pipeline:
     - name: Create Nginx user and directories
       runs: |
-        # Create the 'nginx' user if it does not exist
-        if ! id -u nginx > /dev/null 2>&1; then
-          adduser -D -g 'Nginx User' nginx
-        fi
         # Create necessary directories
         mkdir -p /var/lib/nginx/tmp/client_body /var/lib/nginx/tmp/proxy /var/lib/nginx/tmp/fastcgi /var/lib/nginx/tmp/uwsgi /var/lib/nginx/tmp/scgi /run/nginx
-        chown -R nginx:nginx /var/lib/nginx /run/nginx
     - name: Verify Nginx Version
       runs: |
         # Ensure Nginx is installed and shows the correct version
@@ -303,6 +309,10 @@ test:
         nginx -t  # Verify the configuration is valid
         sleep 5  # Give some time for Nginx to start
         curl -I http://localhost || exit 1  # Check if Nginx is serving a basic request
+    - name: Check modules are installed/loadable
+      runs: |
+        sed -i '1i include /etc/nginx/modules/*.conf;' /etc/nginx/nginx.conf
+        nginx -t
 
 update:
   enabled: true

nginx-stable.yaml

@@ -1,7 +1,7 @@
 package:
   name: nginx-stable
   version: "1.26.3"
-  epoch: 40
+  epoch: 41
   description: HTTP and reverse proxy server (stable version)
   copyright:
     - license: BSD-2-Clause
@@ -192,6 +192,9 @@ subpackages:
       - 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/
+          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/