From 8a84c682751bbd8be596b241fcd68d1d7e1ff940 Mon Sep 17 00:00:00 2001
From: Fredrik Baberg <fredrik.baberg@gmail.com>
Date: Mon, 27 Jun 2022 18:41:31 +0200
Subject: [PATCH] Update nginx configuration

---
 3dprinter-octoprint/Dockerfile                |  4 +++-
 3dprinter-octoprint/config.yaml               |  2 +-
 .../rootfs/etc/cont-init.d/octoprint.sh       |  5 -----
 .../rootfs/etc/nginx/nginx.conf               | 20 +++++++++++++++++++
 .../rootfs/etc/services.d/nginx/run           |  2 +-
 .../rootfs/usr/share/tempio/webui.conf        |  2 +-
 6 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 3dprinter-octoprint/rootfs/etc/nginx/nginx.conf

diff --git a/3dprinter-octoprint/Dockerfile b/3dprinter-octoprint/Dockerfile
index 6cbb198..290d726 100644
--- a/3dprinter-octoprint/Dockerfile
+++ b/3dprinter-octoprint/Dockerfile
@@ -14,6 +14,7 @@ RUN apt update && \
     apt install -y \
         python3-venv \
         python3-dev \
+        python3-wheel \
         build-essential \
         nginx \
     && \
@@ -22,8 +23,9 @@ RUN apt update && \
     && \
     apt clean
 
-# Remove nginx default site.
+# Setup for nginx.
 RUN rm /etc/nginx/sites-enabled/default
+RUN chown -R root:root /var/log/nginx
 
 # Copy root filesystem
 COPY rootfs /
diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml
index ab2cc1e..50c34f2 100644
--- a/3dprinter-octoprint/config.yaml
+++ b/3dprinter-octoprint/config.yaml
@@ -1,5 +1,5 @@
 name: "3DPrinter-OctoPrint"
-version: "2022.6.025"
+version: "2022.6.026"
 slug: "3dprinter-octoprint"
 description: "New instance of OctoPrint"
 url: "https://github.com/fredrikbaberg/home-assistant-addons/tree/main/3dprinter-octoprint"
diff --git a/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh
index 9ecab13..4438f7c 100644
--- a/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh
+++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh
@@ -5,17 +5,12 @@
 # ==============================================================================
 
 { # Check if OctoPrint is installed
-    bashio::log.info "Check OctoPrint version..."
     octoprint --version
 } || { # Otherwise install
     { # Check if Python is available
-        bashio::log.info "Check Python version..."
         python --version
     } || { # Otherwise install
-        bashio::log.info "Install Python..."
         python3 -m venv /data/python/octoprint
     }
-    bashio::log.info "Install OctoPrint..."
     pip install octoprint==$OCTOPRINT_VERSION
 }
-bashio::log.info "OctoPrint ready..."
diff --git a/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf b/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf
new file mode 100644
index 0000000..3ce827a
--- /dev/null
+++ b/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf
@@ -0,0 +1,20 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include            mime.types;
+    default_type       application/octet-stream;
+    sendfile           on;
+    keepalive_timeout  65;
+
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        '' close;
+    }
+
+    include /etc/nginx/sites-enabled/*;
+
+}
diff --git a/3dprinter-octoprint/rootfs/etc/services.d/nginx/run b/3dprinter-octoprint/rootfs/etc/services.d/nginx/run
index 703a2b7..a53787e 100644
--- a/3dprinter-octoprint/rootfs/etc/services.d/nginx/run
+++ b/3dprinter-octoprint/rootfs/etc/services.d/nginx/run
@@ -5,4 +5,4 @@
 # ==============================================================================
 
 bashio::log.info "Starting NGinx..."
-exec nginx
+exec nginx -g 'daemon off;'
diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/webui.conf b/3dprinter-octoprint/rootfs/usr/share/tempio/webui.conf
index 3d0046f..609e513 100644
--- a/3dprinter-octoprint/rootfs/usr/share/tempio/webui.conf
+++ b/3dprinter-octoprint/rootfs/usr/share/tempio/webui.conf
@@ -3,7 +3,7 @@ server {
 	server_name  localhost;
 	
 	location / {
-		proxy_pass http://127.0.0.1:5000/; # make sure to add trailing slash here!
+		proxy_pass http://127.0.0.1:80/; # make sure to add trailing slash here!
 		proxy_set_header Host $http_host;
 		proxy_set_header Upgrade $http_upgrade;
 		proxy_set_header Connection "upgrade";