🔨 Refactor nginx config with template (#55)

* 🔨 Refactor nginx config with template * 🔨 Linting
hassio-addons · Feb 15, 2021 · ac91f17 · ac91f17
1 parent 568a1cc
commit ac91f17
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 49 deletions.
diff --git a/bookstack/config.json b/bookstack/config.json
@@ -7,7 +7,6 @@
   "webui": "[PROTO:ssl]://[HOST]:[PORT:80]",
   "init": false,
   "arch": ["aarch64", "amd64", "armhf", "armv7", "i386"],
-  "hassio_api": true,
   "services": ["mysql:want"],
   "map": ["ssl"],
   "ports": {

diff --git a/bookstack/rootfs/etc/cont-init.d/nginx.sh b/bookstack/rootfs/etc/cont-init.d/nginx.sh
@@ -3,27 +3,14 @@
 # Home Assistant Community Add-on: Bookstack
 # This file configures nginx
 # ==============================================================================
-declare admin_port
-declare certfile
-declare dns_host
-declare keyfile
 
-admin_port=$(bashio::addon.port 80)
-if bashio::var.has_value "${admin_port}"; then
+if bashio::var.has_value "$(bashio::addon.port 80)"; then
     bashio::config.require.ssl
-
-    if bashio::config.true 'ssl'; then
-        certfile=$(bashio::config 'certfile')
-        keyfile=$(bashio::config 'keyfile')
-
-        mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
-        sed -i "s#%%certfile%%#${certfile}#g" /etc/nginx/servers/direct.conf
-        sed -i "s#%%keyfile%%#${keyfile}#g" /etc/nginx/servers/direct.conf
-    else
-        mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
-    fi
-    sed -i "s/%%port%%/80/g" /etc/nginx/servers/direct.conf
+    bashio::var.json \
+        certfile "$(bashio::config 'certfile')" \
+        keyfile "$(bashio::config 'keyfile')" \
+        ssl "^$(bashio::config 'ssl')" \
+        | tempio \
+            -template /etc/nginx/templates/direct.gtpl \
+            -out /etc/nginx/servers/direct.conf
 fi
-
-dns_host=$(bashio::dns.host)
-sed -i "s/%%dns_host%%/${dns_host}/g" /etc/nginx/includes/resolver.conf
diff --git a/bookstack/rootfs/etc/nginx/includes/resolver.conf b/bookstack/rootfs/etc/nginx/includes/resolver.conf
diff --git a/bookstack/rootfs/etc/nginx/nginx.conf b/bookstack/rootfs/etc/nginx/nginx.conf
@@ -16,13 +16,6 @@ pcre_jit on;
 # Write error log to the add-on log.
 error_log /proc/1/fd/1 error;
 
-# Load allowed environment vars
-env SUPERVISOR_TOKEN;
-env DISABLE_HA_AUTHENTICATION;
-
-# Load dynamic modules.
-include /etc/nginx/modules/*.conf;
-
 # Max num of simultaneous connections by a worker process.
 events {
     worker_connections 512;
@@ -50,7 +43,6 @@ http {
         ''      close;
     }
 
-    include /etc/nginx/includes/resolver.conf;
     include /etc/nginx/includes/upstream.conf;
 
     include /etc/nginx/servers/*.conf;

diff --git a/bookstack/rootfs/etc/nginx/servers/.gitkeep b/bookstack/rootfs/etc/nginx/servers/.gitkeep
@@ -0,0 +1 @@
+Without requirements or design, programming is the art of adding bugs to an empty text file. (Louis Srygley)
diff --git a/bookstack/rootfs/etc/nginx/servers/direct-ssl.disabled b/bookstack/rootfs/etc/nginx/servers/direct-ssl.disabled
diff --git a/bookstack/rootfs/etc/nginx/servers/direct.disabled b/bookstack/rootfs/etc/nginx/servers/direct.disabled
diff --git a/bookstack/rootfs/etc/nginx/templates/direct.gtpl b/bookstack/rootfs/etc/nginx/templates/direct.gtpl
@@ -0,0 +1,25 @@
+server {
+    {{ if not .ssl }}
+    listen 80 default_server;
+    {{ else }}
+    listen 80 default_server ssl http2;
+    {{ end }}
+
+    include /etc/nginx/includes/server_params.conf;
+    include /etc/nginx/includes/php.conf;
+
+    {{ if .ssl }}
+    include /etc/nginx/includes/ssl_params.conf;
+
+    ssl_certificate /ssl/{{ .certfile }};
+    ssl_certificate_key /ssl/{{ .keyfile }};
+    {{ end }}
+
+    location ~ .php$ {
+        fastcgi_pass 127.0.0.1:9001;
+        fastcgi_read_timeout 900;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    }
+}