WIP proper rhel

Author: willnode

.github/workflows/release.yml

@@ -23,30 +23,63 @@ jobs:
         release_name: Release ${{ github.event.inputs.version }}
         draft: false
         prerelease: false
-  release_assets:
-    name: Release assets
-    needs: create_release # we need to know the upload URL
-    runs-on: ${{ matrix.config.os }} # we run many different builds
+# right now only test rhel
+  # release_ubuntu_assets:
+  #   name: Release Ubuntu 24 Assets
+  #   needs: create_release
+  #   runs-on: ${{ matrix.config.os }}
+  #   strategy:
+  #     matrix:
+  #       config:
+  #         - os: ubuntu-24.04
+  #           filename: nginx-builder-ubuntu-24-amd64.tar.gz
+  #         - os: ubuntu-24.04-arm
+  #           filename: nginx-builder-ubuntu-24-arm64.tar.gz
+  #   steps:
+  #   - name: Checkout code
+  #     uses: actions/checkout@v4
+  #   - name: Install deps
+  #     run: |
+  #       sudo apt-get install -y libcurl4-openssl-dev
+  #       sudo /usr/bin/ruby3.2 /usr/bin/gem install rack
+  #   - name: Build Binary
+  #     run: make build
+  #   - name: Upload release assets
+  #     uses: softprops/action-gh-release@v1
+  #     env:
+  #       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #     with:
+  #       upload_url: ${{ needs.create_release.outputs.upload_url }}
+  #       asset_name: ${{ matrix.config.filename }}.tar.gz
+  #       asset_path: nginx-builder.tar.gz
+  #       asset_content_type: application/gzip
+  release_rocky_assets:
+    name: Release Rocky 9 Assets
+    needs: create_release
+    runs-on: ${{ matrix.config.os }}
+    container:
+      image: rockylinux/rockylinux:9
     strategy:
       matrix:
         config:
           - os: ubuntu-24.04
+            filename: nginx-builder-ubuntu-24-amd64.tar.gz
           - os: ubuntu-24.04-arm
+            filename: nginx-builder-ubuntu-24-arm64.tar.gz
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
     - name: Install deps
       run: |
-        sudo apt-get install -y libcurl4-openssl-dev
-        sudo /usr/bin/ruby3.2 /usr/bin/gem install rack
+        yum install git gcc gcc-c++ make
     - name: Build Binary
       run: make build
     - name: Upload release assets
-      uses: actions/upload-release-asset@v1
+      uses: softprops/action-gh-release@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ needs.create_release.outputs.upload_url }}
-        asset_name: nginx-builder-artifacts-${{ matrix.config.os }}
+        asset_name: ${{ matrix.config.filename }}.tar.gz
         asset_path: nginx-builder.tar.gz
-        asset_content_type: application/octet-stream
+        asset_content_type: application/gzip

Makefile

@@ -3,13 +3,27 @@ all: opt
 NGINX_V := 1.26.2
 LIBRE_V := 4.0.0
 PASSENGER_V := 6.0.26
-# Added by passenger itself: http_ssl_module http_v2_module http_realip_module http_gzip_static_module http_stub_status_module http_addition_module
 ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
+HOST_OS := $(shell if [ -f /etc/lsb-release ]; then echo debian; elif [ -f /etc/redhat-release ]; then echo fedora; else echo unknown; fi)
+DOWNLOAD_V ?= "" # option for install with prebuilt GitHub version
+
 NGINX_PASSENGER_MODULES := --with-http_ssl_module --with-http_v2_module --with-http_realip_module --with-http_gzip_static_module --with-http_stub_status_module --with-http_addition_module --add-module='$(ROOT_DIR)passenger/src/nginx_module'
 NGINX_MODULES := --user=nginx --group=nginx --with-compat --with-debug --with-file-aio --with-http_v3_module --with-pcre --with-pcre-jit --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-threads --with-openssl="../libressl"
 NGINX_OPTIMIZATIONS := --with-cc-opt='-I../libressl/build/include -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -fstack-protector-strong -fasynchronous-unwind-tables -fstack-clash-protection' --with-ld-opt='-L../libressl/build/lib -Wl,-z,relro -Wl,--as-needed -Wl,-z,now -Wl,-E'
 NGINX_FEDORA_CONFIG := --sbin-path=/usr/local/sbin/nginx --modules-path=/usr/local/lib64/nginx/modules --conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error.log --http-log-path=/var/log/nginx/access.log --http-client-body-temp-path=/var/lib/nginx/tmp/client_body --http-proxy-temp-path=/var/lib/nginx/tmp/proxy --http-fastcgi-temp-path=/var/lib/nginx/tmp/fastcgi --http-uwsgi-temp-path=/var/lib/nginx/tmp/uwsgi --http-scgi-temp-path=/var/lib/nginx/tmp/scgi --pid-path=/run/nginx.pid --lock-path=/run/lock/subsys/nginx
 NGINX_DEBIAN_CONFIG := --sbin-path=/usr/local/sbin/nginx --modules-path=/usr/local/lib/nginx/modules --conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error.log --http-log-path=/var/log/nginx/access.log --http-client-body-temp-path=/var/lib/nginx/body --http-proxy-temp-path=/var/lib/nginx/proxy --http-fastcgi-temp-path=/var/lib/nginx/fastcgi --http-uwsgi-temp-path=/var/lib/nginx/uwsgi --http-scgi-temp-path=/var/lib/nginx/scgi --pid-path=/run/nginx.pid --lock-path=/var/lock/nginx.lock
+NGINX_TMP_FEDORA_DIRS := /var/lib/nginx/tmp/{client_body,fastcgi,proxy,scgi,uwsgi}
+NGINX_TMP_DEBIAN_DIRS := /var/lib/nginx/{body,fastcgi,proxy,scgi,uwsgi}
+
+ifeq ($(HOST_OS),fedora)
+	NGINX_CONFIG := $(NGINX_FEDORA_CONFIG)
+	NGINX_TMP_DIRS := $(NGINX_TMP_FEDORA_DIRS)
+else ifeq ($(OS),fedora)
+	NGINX_CONFIG := $(NGINX_DEBIAN_CONFIG)
+	NGINX_TMP_DIRS := $(NGINX_TMP_DEBIAN_DIRS)
+else
+    $(error Unsupported OS detected)
+endif
 
 nginx-$(NGINX_V).tar.gz:
 	curl -sSLO "https://www.nginx.org/download/nginx-$(NGINX_V).tar.gz"
@@ -45,28 +59,20 @@ opt: nginx passenger libressl
 
 build: nginx passenger libressl
 	rm -rf build
-	mkdir -p build/debian
+	mkdir -p build
 	./passenger/bin/passenger-install-nginx-module --auto --languages=ruby,python,nodejs \
 	--nginx-source-dir=./nginx --prefix=/usr/local/share/nginx --nginx-no-install \
-	"--extra-configure-flags=$(NGINX_DEBIAN_CONFIG) $(NGINX_MODULES) $(NGINX_OPTIMIZATIONS)"
-	cp -a nginx/objs/nginx build/debian/nginx
-	mkdir -p build/fedora
-# For faster build we extract commands from passenger-install-nginx-module
-	cd nginx && sh ./configure --prefix='/usr/local/share/nginx' \
-	$(NGINX_PASSENGER_MODULES) $(NGINX_FEDORA_CONFIG) $(NGINX_MODULES) $(NGINX_OPTIMIZATIONS) && make
-	cp -a nginx/objs/nginx build/fedora/nginx
-	cp -a passenger/buildout build/passenger
-	find build -type f -name "*.o" -delete
-	tar -czvf nginx-builder.tar.gz build
+	"--extra-configure-flags=$(NGINX_CONFIG) $(NGINX_MODULES) $(NGINX_OPTIMIZATIONS)"
+	cp -a nginx/objs/nginx build/nginx
 
 install: nginx passenger libressl
 # Run the Passenger installation with Nginx module
 	./passenger/bin/passenger-install-nginx-module --auto --languages=ruby,python,nodejs \
 	--nginx-source-dir=./nginx --prefix=/usr/local --nginx-no-install \
-	"--extra-configure-flags=$(NGINX_FEDORA_CONFIG) $(NGINX_MODULES) $(NGINX_OPTIMIZATIONS)"
+	"--extra-configure-flags=$(NGINX_CONFIG) $(NGINX_MODULES) $(NGINX_OPTIMIZATIONS)"
 	cp -a nginx/objs/nginx /usr/local/sbin/nginx; chmod +x /usr/local/sbin/nginx
 # Create necessary directories and set permissions
-	mkdir -p /usr/local/lib64/nginx/modules /var/log/nginx /var/lib/nginx/tmp/{client_body,fastcgi,proxy,scgi,uwsgi} /etc/nginx/conf.d /var/run/passenger-instreg
+	mkdir -p /usr/local/lib64/nginx/modules /var/log/nginx $(NGINX_TMP_DIRS) /etc/nginx/conf.d /var/run/passenger-instreg
 	getent group nginx > /dev/null || groupadd -r nginx && id -u nginx > /dev/null 2>&1 || useradd -r -g nginx -s /sbin/nologin -d /nonexistent -c "nginx user" nginx
 	chmod 0700 -R /var/log/nginx /var/lib/nginx/
 	chown -R nginx:root /var/lib/nginx