From fa12b7491cd6bfad177d1d550b3d9b941bac948e Mon Sep 17 00:00:00 2001
From: Dan Anglin <daangling@gmail.com>
Date: Sun, 5 Feb 2023 16:07:36 +0000
Subject: [PATCH] fix: update GTS configuration

- Change the instance name to 'Free Flow'.
- Change the local GTS docker image version from 'latest' to
  $GTS_VERSION.
- Use GTS_DOCKER_IMAGE_DIGEST to specify the image digest.
- Allow users (i.e. myself) to upload custom CSS.
---
 config                                | 2 +-
 templates/compose/docker-compose.yaml | 2 +-
 templates/gotosocial/Dockerfile       | 2 +-
 templates/gotosocial/config.yaml      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config b/config
index d8868a9..0dda4e5 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit d8868a93bb9d01c32ba37566016125d95a0f4192
+Subproject commit 0dda4e50e69cd0b4b01feedcf7ea3867214e5b1d
diff --git a/templates/compose/docker-compose.yaml b/templates/compose/docker-compose.yaml
index b6b1680..f7e7491 100644
--- a/templates/compose/docker-compose.yaml
+++ b/templates/compose/docker-compose.yaml
@@ -85,7 +85,7 @@ services:
   # -- Free Flow 2 --
   gotosocial:
     container_name: "free-flow-2"
-    image: localhost/flow/gotosocial:latest
+    image: localhost/flow/gotosocial:${GTS_VERSION}
     build:
       context: "../gotosocial"
     expose:
diff --git a/templates/gotosocial/Dockerfile b/templates/gotosocial/Dockerfile
index 6e56e44..36bdb18 100644
--- a/templates/gotosocial/Dockerfile
+++ b/templates/gotosocial/Dockerfile
@@ -1,4 +1,4 @@
-FROM superseriousbusiness/gotosocial:${GTS_VERSION}
+FROM superseriousbusiness/gotosocial:${GTS_VERSION}@${GTS_DOCKER_IMAGE_DIGEST}
 
 USER 0
 
diff --git a/templates/gotosocial/config.yaml b/templates/gotosocial/config.yaml
index 3d48522..3e7708e 100644
--- a/templates/gotosocial/config.yaml
+++ b/templates/gotosocial/config.yaml
@@ -33,7 +33,7 @@ log-db-queries: false
 # String. Application name to use internally.
 # Examples: ["My Application","gotosocial"]
 # Default: "gotosocial"
-application-name: "${GTS_APPLICATION_NAME_01} ${GTS_APPLICATION_NAME_02} ${GTS_APPLICATION_NAME_03}"
+application-name: "${GTS_APPLICATION_NAME_01} ${GTS_APPLICATION_NAME_02}"
 
 # String. Hostname that this server will be reachable at. Defaults to localhost for local testing,
 # but you should *definitely* change this when running for real, or your server won't work at all.
@@ -234,7 +234,7 @@ accounts-reason-required: true
 #
 # Options: [true, false]
 # Default: false
-accounts-allow-custom-css: false
+accounts-allow-custom-css: true
 
 ########################
 ##### MEDIA CONFIG #####