From 200e2d82c77b89817e0c064a5b9a3e8b11c7610d Mon Sep 17 00:00:00 2001
From: Marwolf <cleako@gmail.com>
Date: Sat, 18 Aug 2018 13:03:12 -0400
Subject: [PATCH] Disabling PHP

---
 docker-compose.yml               | 30 +++++++++++++++---------------
 etc/nginx/HTTPS_default.conf.BAK | 17 ++++++++---------
 etc/nginx/nginx.conf             | 16 ++++++++--------
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f0cb311..ec7c94c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,14 +9,14 @@ services:
             - "./Website:/opt/bitnami/nginx/html"
             - "./etc/logs/nginx:/opt/bitnami/nginx/logs"
             - "./etc/letsencrypt/certs:/opt/bitnami/nginx/conf/bitnami/certs"
-            - "./etc/nginx/fastcgi.conf:/bitnami/nginx/conf/fastcgi.conf"
+#            - "./etc/nginx/fastcgi.conf:/bitnami/nginx/conf/fastcgi.conf"
         ports:
             - "80:8080"
             - "443:443"
         environment:
             - NGINX_HOST=${NGINX_HOST}
-            - LETSENCRYPT_HOST=localhost
-            - LETSENCRYPT_EMAIL=your.email@here.com
+#            - LETSENCRYPT_HOST=localhost
+#            - LETSENCRYPT_EMAIL=root@root.com
         restart: always
 
     myadmin:
@@ -106,18 +106,18 @@ services:
         depends_on:
           - fix-ghost-permissions
 
-    php:
-        image: bitnami/php-fpm:latest
-        container_name: php
-        restart: always
-        ports:
-            - "9001:9000"
-        volumes:
-            - "./etc/php/php.ini:/opt/bitnami/php/etc/conf.d/php.ini"
-            - "./Website:/app"
-            - "./etc/logs/php:/opt/bitnami/php/log"
-        depends_on:
-          - nginx
+#    php:
+#        image: bitnami/php-fpm:latest
+#        container_name: php
+#        restart: always
+#        ports:
+#            - "9001:9000"
+#        volumes:
+#            - "./etc/php/php.ini:/opt/bitnami/php/etc/conf.d/php.ini"
+#            - "./Website:/app"
+#            - "./etc/logs/php:/opt/bitnami/php/log"
+#        depends_on:
+#          - nginx
 
 volumes:
   mariadb_data:
diff --git a/etc/nginx/HTTPS_default.conf.BAK b/etc/nginx/HTTPS_default.conf.BAK
index 88f0bf3..6d1dbf9 100755
--- a/etc/nginx/HTTPS_default.conf.BAK
+++ b/etc/nginx/HTTPS_default.conf.BAK
@@ -42,22 +42,22 @@ server {
     ssl_trusted_certificate   /etc/letsencrypt/live/${NGINX_HOST}/chain.pem;
 
     root /app;
-    index index.jsp index.html index.htm index.php;
+    index index.jsp index.html index.htm;
 
     client_max_body_size                    100M;
 
     location / {
-        try_files $uri $uri/index.php;
+        try_files $uri $uri/ =404;
     }
 
     ####### Proxies #######
     # PHP proxy
-    location ~ \.php$ {
-        fastcgi_pass php:9001;
-        fastcgi_index index.php;
-        include fastcgi.conf;
-        root /app;
-    }
+#    location /board {
+#        fastcgi_pass php:9001;
+#        fastcgi_index index.php;
+#        include fastcgi.conf;
+#        root /app;
+#    }
 
     location ~ \.htm$ {
         root   /opt/bitnami/nginx/html;
@@ -81,7 +81,6 @@ server {
         proxy_pass                          http://tomcat;
     }
 
-    # Certbot for HTTPS cert renewal
     location ~ /.well-known {
             root   /opt/bitnami/nginx/html;
             allow all;
diff --git a/etc/nginx/nginx.conf b/etc/nginx/nginx.conf
index d15c157..e7b3cf3 100755
--- a/etc/nginx/nginx.conf
+++ b/etc/nginx/nginx.conf
@@ -16,22 +16,22 @@ server {
     access_log                              /opt/bitnami/nginx/logs/access.log;
 
     root /app;
-    index index.jsp index.html index.htm index.php;
+    index index.jsp index.html index.htm;
 
     client_max_body_size                    100M;
 
     location / {
-        try_files $uri $uri/index.php;
+        try_files $uri $uri/ =404;
     }
 
     ####### Proxies #######
     # PHP proxy
-    location ~ \.php$ {
-        fastcgi_pass php:9001;
-        fastcgi_index index.php;
-        include fastcgi.conf;
-        root /app;
-    }
+#    location /board {
+#        fastcgi_pass php:9001;
+#        fastcgi_index index.php;
+#        include fastcgi.conf;
+#        root /app;
+#    }
 
     location ~ \.htm$ {
         root   /opt/bitnami/nginx/html;