diff --git a/Dockerfile b/Dockerfile index 725755f..e1c80cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,6 +23,9 @@ RUN sed -i '/blahblah/i\return 0;' config.m4 && \ FROM alpine:3.16 AS asset COPY --from=iconv /iconv/ /asset/usr/ COPY --from=vlmcsd /tmp/vlmcs* /asset/usr/bin/ +RUN apk add php8-fpm && mkdir -p /asset/etc/php8/ && \ + sed -i 's/^;\(pid\)/\1/' /etc/php8/php-fpm.conf && \ + mv /etc/php8/php-fpm.conf /asset/etc/php8/ COPY . /asset/kms-server/ RUN mkdir -p /asset/etc/ && mv /asset/kms-server/nginx/ /asset/etc/ diff --git a/main.php b/main.php index 6c96fbe..4edf872 100644 --- a/main.php +++ b/main.php @@ -9,7 +9,7 @@ require_once './src/Process.php'; $nginx = array( 'name' => 'nginx', 'command' => ['/usr/sbin/nginx'], - 'pidFile' => '/run/nginx/nginx.pid', + 'pidFile' => '/run/nginx.pid', ); $phpFpm = array( diff --git a/nginx/kms.conf b/nginx/kms.conf index 3604bdc..ce16214 100644 --- a/nginx/kms.conf +++ b/nginx/kms.conf @@ -1,5 +1,6 @@ server { listen 1689; + listen [::]:1689 ipv6only=on; root /kms-server; location / { diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 41ac84a..b0cf953 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -1,6 +1,8 @@ user nginx; -worker_processes auto; pcre_jit on; +pid /run/nginx.pid; + +worker_processes auto; include /etc/nginx/modules/*.conf; events {