removed lighttpd open_basedir, aligned nginx conf to lighttpd one

1 files changed, 44 insertions, 6 deletions

diff --git a/nginx.pi-hole.conf b/nginx.pi-hole.conf
index 895bc839cce4..a24e38381d7d 100644
--- a/nginx.pi-hole.conf
+++ b/nginx.pi-hole.conf
@@ -1,26 +1,64 @@
 # place in /etc/nginx/conf.d/pihole.conf
 
-server {  
+server {
+    listen   80;
+    listen   [::]:80;
+    server_name pi.hole;
+
+    root /srv/http/pihole;
+    index index.php;
+
+    if ( $request_uri = / ) {
+        rewrite ^/$ $scheme://$host/admin/ permanent;
+    }
+
+    location /admin {
+        try_files $uri $uri/ /index.php;
+        add_header X-Pi-hole "The Pi-hole Web interface is working!";
+        add_header X-Frame-Options "DENY";
+    }
+
+    location ~ \.php$ {
+        fastcgi_param HTTP_HOST localhost;
+        fastcgi_param HTTP_ORIGIN localhost;
+        fastcgi_pass  127.0.0.1:9000;
+        fastcgi_index index.php;
+        include fastcgi.conf;
+    }
+}
+
+server {
     listen   80 default_server;
     listen   [::]:80 default_server;
     server_name _;
 
-    root /srv/http/pihole/admin;
+    root /srv/http/pihole;
     index index.php;
 
+    proxy_intercept_errors on;
+    error_page 404 /pihole/index.php;
+
+    if ( $request_uri ~ ^(?!/pihole/)(?!/admin/).*\.js$ ) {
+        rewrite ^.*\.js$ $scheme://$host/pihole/index.js permanent;
+    }
+
     location / {
         try_files $uri $uri/ /index.php;
+        add_header X-Pi-hole "A black hole for Internet advertisements";
     }
 
-    location ~ /\. {
-        deny  all;
+    location /admin {
+        try_files $uri $uri/ /index.php;
+        add_header X-Pi-hole "The Pi-hole Web interface is working!";
+        add_header X-Frame-Options "DENY";
     }
 
     location ~ \.php$ {
+        fastcgi_intercept_errors on;
         fastcgi_param HTTP_HOST localhost;
         fastcgi_param HTTP_ORIGIN localhost;
-        fastcgi_pass   127.0.0.1:9000;
-        fastcgi_index  index.php;
+        fastcgi_pass  127.0.0.1:9000;
+        fastcgi_index index.php;
         include fastcgi.conf;
     }
 }