From 3c50dd9548864e78f6390f7697cf1331336d91b2 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Sat, 15 Feb 2020 16:16:33 +0100
Subject: [PATCH] :hammer: Updates for upstream Supervisor changes

---
 vscode/rootfs/etc/cont-init.d/nginx.sh         |  6 +++---
 vscode/rootfs/etc/nginx/includes/resolver.conf |  2 +-
 vscode/rootfs/etc/nginx/lua/ha-auth.lua        |  2 +-
 vscode/rootfs/etc/nginx/nginx.conf             | 10 +++++-----
 vscode/rootfs/etc/services.d/code/run          |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/vscode/rootfs/etc/cont-init.d/nginx.sh b/vscode/rootfs/etc/cont-init.d/nginx.sh
index 4afccc2..bf82a58 100644
--- a/vscode/rootfs/etc/cont-init.d/nginx.sh
+++ b/vscode/rootfs/etc/cont-init.d/nginx.sh
@@ -5,7 +5,7 @@
 # ==============================================================================
 declare port
 declare certfile
-declare hassio_dns
+declare dns_host
 declare ingress_interface
 declare ingress_port
 declare keyfile
@@ -32,5 +32,5 @@ ingress_interface=$(bashio::addon.ip_address)
 sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
 sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
 
-hassio_dns=$(bashio::dns.host)
-sed -i "s/%%hassio_dns%%/${hassio_dns}/g" /etc/nginx/includes/resolver.conf
+dns_host=$(bashio::dns.host)
+sed -i "s/%%dns_host%%/${dns_host}/g" /etc/nginx/includes/resolver.conf
diff --git a/vscode/rootfs/etc/nginx/includes/resolver.conf b/vscode/rootfs/etc/nginx/includes/resolver.conf
index 65c431d..d864899 100644
--- a/vscode/rootfs/etc/nginx/includes/resolver.conf
+++ b/vscode/rootfs/etc/nginx/includes/resolver.conf
@@ -1 +1 @@
-resolver %%hassio_dns%%;
+resolver %%dns_host%%;
diff --git a/vscode/rootfs/etc/nginx/lua/ha-auth.lua b/vscode/rootfs/etc/nginx/lua/ha-auth.lua
index 7aa9d3e..a2c633c 100644
--- a/vscode/rootfs/etc/nginx/lua/ha-auth.lua
+++ b/vscode/rootfs/etc/nginx/lua/ha-auth.lua
@@ -36,7 +36,7 @@ function authenticate()
         body = ngx.encode_args({["username"]=username, ["password"]=password}),
         headers = {
             ["Content-Type"] = "application/x-www-form-urlencoded",
-            ["X-HASSIO-KEY"] = os.getenv("HASSIO_TOKEN"),
+            ["X-Supervisor-Token"] = os.getenv("SUPERVISOR_TOKEN"),
         },
         keepalive_timeout = 60,
         keepalive_pool = 10
diff --git a/vscode/rootfs/etc/nginx/nginx.conf b/vscode/rootfs/etc/nginx/nginx.conf
index 5d5980a..c251be5 100644
--- a/vscode/rootfs/etc/nginx/nginx.conf
+++ b/vscode/rootfs/etc/nginx/nginx.conf
@@ -17,7 +17,7 @@ pcre_jit on;
 error_log /proc/1/fd/1 error;
 
 # Load allowed environment vars
-env HASSIO_TOKEN;
+env SUPERVISOR_TOKEN;
 env DISABLE_HA_AUTHENTICATION;
 
 # Load dynamic modules.
@@ -31,11 +31,11 @@ events {
 http {
     include /etc/nginx/includes/mime.types;
 
-    log_format hassio '[$time_local] $status '
-                        '$http_x_forwarded_for($remote_addr) '
-                        '$request ($http_user_agent)';
+    log_format homeassistant '[$time_local] $status '
+                             '$http_x_forwarded_for($remote_addr) '
+                             '$request ($http_user_agent)';
 
-    access_log              /proc/1/fd/1 hassio;
+    access_log              /proc/1/fd/1 homeassistant;
     client_max_body_size    4G;
     default_type            application/octet-stream;
     gzip                    on;
diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run
index e2d649a..269ef06 100644
--- a/vscode/rootfs/etc/services.d/code/run
+++ b/vscode/rootfs/etc/services.d/code/run
@@ -20,8 +20,8 @@ fi
 options+=(--auth none)
 
 # Export env variables for the Home Assistant extension
-export HASS_SERVER="http://hassio/homeassistant"
-export HASS_TOKEN="${HASSIO_TOKEN:-}"
+export HASS_SERVER="http://supervisor/core"
+export HASS_TOKEN="${SUPERVISOR_TOKEN:-}"
 
 # Run the code server
 exec code-server "${options[@]}" /config