Merge pull request #20 from linuxserver/not-start-fpm

linuxserver · Aug 25, 2023 · 41b6c03 · 41b6c03
2 parents 1829073 + 98c0a6e
commit 41b6c03
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -34,6 +34,9 @@ RUN \
   npm i && \
   echo "**** cleanup ****" && \
   rm -rf \
+    /etc/logrotate.d/php-fpm \
+    /etc/s6-overlay/s6-rc.d/svc-php-fpm \
+    /etc/s6-overlay/s6-rc.d/user/contents.d/svc-php-fpm \
     /tmp/* \
     $HOME/.cache
 

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -34,6 +34,9 @@ RUN \
   npm i && \
   echo "**** cleanup ****" && \
   rm -rf \
+    /etc/logrotate.d/php-fpm \
+    /etc/s6-overlay/s6-rc.d/svc-php-fpm \
+    /etc/s6-overlay/s6-rc.d/user/contents.d/svc-php-fpm \
     /tmp/* \
     $HOME/.cache
 

diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample
@@ -1,4 +1,4 @@
-## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-snapdrop/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2023/08/25 - Changelog: https://github.com/linuxserver/docker-snapdrop/commits/master/root/defaults/nginx/site-confs/default.conf.sample
 
 server {
     listen 80 default_server;
@@ -30,13 +30,6 @@ server {
         proxy_set_header X-Forwarded-for $remote_addr;
     }
 
-    location ~ ^(.+\.php)(.*)$ {
-        fastcgi_split_path_info ^(.+\.php)(.*)$;
-        fastcgi_pass 127.0.0.1:9000;
-        fastcgi_index index.php;
-        include /etc/nginx/fastcgi_params;
-    }
-
     # deny access to .htaccess/.htpasswd files
     location ~ /\.ht {
         deny all;