From 9346898775c062bb74ba630e0798d950574519a0 Mon Sep 17 00:00:00 2001
From: Marcin S <marcin@bytedude.com>
Date: Tue, 18 May 2021 15:35:24 -0400
Subject: [PATCH] Test deploy

---
 docker-compose.jaeger.yml                            | 12 ++++++++----
 docker/kratos/cr_certs/README.md                     |  2 +-
 docker/nginx/conf.d/client.conf                      |  1 +
 .../dashboard/src/components/Form/SelfServiceForm.js |  5 ++---
 scripts/README.md                                    |  6 ++++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/docker-compose.jaeger.yml b/docker-compose.jaeger.yml
index a12966b1..17f8489a 100644
--- a/docker-compose.jaeger.yml
+++ b/docker-compose.jaeger.yml
@@ -1,10 +1,10 @@
-version: '3.7'
+version: "3.7"
 
 services:
   sia:
     environment:
-      - JAEGER_DISABLED=${JAEGER_DISABLED:-true}  # Enable/Disable tracing
-      - JAEGER_SERVICE_NAME=${PORTAL_NAME:-Skyd}  # change to e.g. eu-ger-1
+      - JAEGER_DISABLED=${JAEGER_DISABLED:-true} # Enable/Disable tracing
+      - JAEGER_SERVICE_NAME=${PORTAL_NAME:-Skyd} # change to e.g. eu-ger-1
       # Configuration
       # See https://github.com/jaegertracing/jaeger-client-go#environment-variables
       # for all options.
@@ -16,7 +16,11 @@ services:
 
   jaeger-agent:
     image: jaegertracing/jaeger-agent
-    command: [ "--reporter.grpc.host-port=jaeger-collector:14250", "--reporter.grpc.retry.max=1000" ]
+    command:
+      [
+        "--reporter.grpc.host-port=jaeger-collector:14250",
+        "--reporter.grpc.retry.max=1000",
+      ]
     container_name: jaeger-agent
     restart: on-failure
     expose:
diff --git a/docker/kratos/cr_certs/README.md b/docker/kratos/cr_certs/README.md
index 47c143eb..72e8dda8 100644
--- a/docker/kratos/cr_certs/README.md
+++ b/docker/kratos/cr_certs/README.md
@@ -4,4 +4,4 @@ outlined in the README in the root directory, under "Setting up CockroachDB".
 The only difference between the files here and those under
 `docker/cockroach/certs` is that the files here need to be readable by anyone, while the files under `cockroach` need to
 have their original access rights
-(all *.key files should be 600 instead of 644 there).
+(all \*.key files should be 600 instead of 644 there).
diff --git a/docker/nginx/conf.d/client.conf b/docker/nginx/conf.d/client.conf
index c0942fba..d45d0a00 100644
--- a/docker/nginx/conf.d/client.conf
+++ b/docker/nginx/conf.d/client.conf
@@ -397,6 +397,7 @@ server {
 
 		# proxy /skynet/tus requests to siad endpoint with all arguments
 		proxy_pass http://siad;
+		proxy_redirect https://siad/ https://$domain.$tld/;
 	}
 
 	location /skynet/metadata {
diff --git a/packages/dashboard/src/components/Form/SelfServiceForm.js b/packages/dashboard/src/components/Form/SelfServiceForm.js
index d84fc1c2..67e4f717 100644
--- a/packages/dashboard/src/components/Form/SelfServiceForm.js
+++ b/packages/dashboard/src/components/Form/SelfServiceForm.js
@@ -37,9 +37,8 @@ export default function SelfServiceForm({ flow, config, fieldsConfig, title, but
                       "border-gray-300 placeholder-gray-400 focus:ring-green-500 focus:border-green-500": !Boolean(
                         field?.messages?.length
                       ),
-                      "border-red-300 text-red-900 placeholder-red-300 focus:ring-red-500 focus:border-red-500": Boolean(
-                        field?.messages?.length
-                      ),
+                      "border-red-300 text-red-900 placeholder-red-300 focus:ring-red-500 focus:border-red-500":
+                        Boolean(field?.messages?.length),
                     }
                   )}
                 />
diff --git a/scripts/README.md b/scripts/README.md
index a5da387b..e7b909b4 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -2,7 +2,8 @@
 
 This package contains useful scripts for managing a Skynet Webportal.
 
-## Available Scripts 
+## Available Scripts
+
 **blocklist-skylink.sh**\
 The `blocklist-skylink.sh` script adds a skylink to the blocklist on all
 servers.
@@ -29,11 +30,12 @@ The `portal-upgrade.sh` script upgrades the docker images for a portal and
 clears and leftover images.
 
 ## Webportal Upgrade Procedures
+
 TODO...
+
 1. 1 server upgraded at a time
 1. Clusters of servers upgraded at a time
 1. How to safetly revert to previous stable version. Document what those
    versions were.
 1. Upgrading single subsystem
 1. Upgrading multiple subsystems
-