From 0a861c7585fe4513a5f1a0184ad373927cf54b20 Mon Sep 17 00:00:00 2001
From: mat ess <mat@mat.services>
Date: Mon, 24 Jul 2023 22:46:34 -0400
Subject: [PATCH] Updates, migrations

---
 gitea/fly.toml       | 70 ++++++++++++++++++++++++--------------------
 goatcounter/fly.toml | 48 +++++++++++++++---------------
 2 files changed, 64 insertions(+), 54 deletions(-)

diff --git a/gitea/fly.toml b/gitea/fly.toml
index dc7b2d0..8d50ac3 100644
--- a/gitea/fly.toml
+++ b/gitea/fly.toml
@@ -1,61 +1,69 @@
-# fly.toml file generated for gitea-mat-services on 2022-07-02T22:14:05-04:00
+# fly.toml app configuration file generated for gitea-mat-services on 2023-07-24T19:00:34-04:00
+#
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
 
 app = "gitea-mat-services"
-
+primary_region = "ewr"
 kill_signal = "SIGINT"
-kill_timeout = 5
+kill_timeout = "5s"
+
+[experimental]
+  auto_rollback = true
 
 [build]
-  image = "codeberg.org/forgejo/forgejo:1.19.1-0"
+  image = "codeberg.org/forgejo/forgejo:1.20.1-0"
 
 [env]
   GITEA____APP_NAME = "git.mat.services: Git for us"
-  GITEA__ui__DEFAULT_THEME = "forgejo-auto"
-  "GITEA__ui.meta__AUTHOR" = "git.mat.services: Git for us"
   GITEA__database__DB_TYPE = "sqlite3"
   GITEA__database__PATH = "/data/gitea/gitea.db"
-  GITEA__server__DOMAIN = "git.mat.services"
-  GITEA__server__SSH_DOMAIN = "git.mat.services"
-  GITEA__server__ROOT_URL = "https://git.mat.services"
-  GITEA__security__INSTALL_LOCK = "true" # Don't show installer
   GITEA__federation__ENABLED = "true"
-  GITEA__service__DISABLE_REGISTRATION = "false"
-  GITEA__service__REGISTER_MANUAL_CONFIRM = "true"
+  GITEA__mailer__ENABLED = "false"
+  GITEA__mailer__FROM = "noreply@git.mat.services"
+  GITEA__mailer__PROTOCOL = "sendmail"
+  GITEA__mailer__SUBJECT_PREFIX = "git.mat.services"
+  GITEA__security__INSTALL_LOCK = "true"
+  GITEA__server__DOMAIN = "git.mat.services"
+  GITEA__server__ROOT_URL = "https://git.mat.services"
+  GITEA__server__SSH_DOMAIN = "git.mat.services"
   GITEA__service__DEFAULT_KEEP_EMAIL_PRIVATE = "true"
   GITEA__service__DEFAULT_USER_IS_RESTRICTED = "true"
-  # sendmail isnt working in the fly vm
+  GITEA__service__DISABLE_REGISTRATION = "false"
   GITEA__service__REGISTER_EMAIL_CONFIRM = "false"
-  GITEA__mailer__ENABLED = "false"
-  GITEA__mailer__PROTOCOL = "sendmail"
-  GITEA__mailer__FROM = "noreply@git.mat.services"
-  GITEA__mailer__SUBJECT_PREFIX = "git.mat.services"
+  GITEA__service__REGISTER_MANUAL_CONFIRM = "true"
+  "GITEA__ui.meta__AUTHOR" = "git.mat.services: Git for us"
+  GITEA__ui__DEFAULT_THEME = "forgejo-auto"
 
-[experimental]
-  allowed_public_ports = []
-  auto_rollback = true
-
-[mounts]
-  destination = "/data"
+[[mounts]]
   source = "gitea_data"
+  destination = "/data"
+  processes = ["app"]
 
-# ssh traffic
 [[services]]
-  internal_port = 22
   protocol = "tcp"
+  internal_port = 22
+
   [[services.ports]]
     port = 22
+  [services.concurrency]
+    type = "connections"
+    hard_limit = 25
+    soft_limit = 20
 
-# https traffic
 [[services]]
-  internal_port = 3000
   protocol = "tcp"
-  
+  internal_port = 3000
+
   [[services.ports]]
+    port = 80
     handlers = ["http"]
     force_https = true
-    port = 80
 
   [[services.ports]]
-    handlers = ["tls", "http"]
     port = 443
-
+    handlers = ["tls", "http"]
+  [services.concurrency]
+    type = "connections"
+    hard_limit = 25
+    soft_limit = 20
diff --git a/goatcounter/fly.toml b/goatcounter/fly.toml
index a000cc6..28e7046 100644
--- a/goatcounter/fly.toml
+++ b/goatcounter/fly.toml
@@ -1,8 +1,15 @@
-# fly.toml file generated for goatcounter-mat-services on 2022-09-03T21:18:21-04:00
+# fly.toml app configuration file generated for goatcounter-mat-services on 2023-07-24T19:04:47-04:00
+#
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
 
 app = "goatcounter-mat-services"
+primary_region = "ewr"
 kill_signal = "SIGINT"
-kill_timeout = 5
+kill_timeout = "5s"
+
+[experimental]
+  auto_rollback = true
 
 [env]
   GOATCOUNTER_DB = "sqlite+/data/goatcounter.sqlite3"
@@ -12,36 +19,31 @@ kill_timeout = 5
   GOATCOUNTER_LISTEN = "0.0.0.0:8080"
   GOATCOUNTER_SMTP = ""
 
-[experimental]
-  allowed_public_ports = []
-  auto_rollback = true
-
-[mounts]
-  destination = "/data"
+[[mounts]]
   source = "goatcounter_data"
+  destination = "/data"
+  processes = ["app"]
 
 [[services]]
-  http_checks = []
+  protocol = "tcp"
   internal_port = 8080
   processes = ["app"]
-  protocol = "tcp"
-  script_checks = []
+
+  [[services.ports]]
+    port = 80
+    handlers = ["http"]
+    force_https = true
+
+  [[services.ports]]
+    port = 443
+    handlers = ["tls", "http"]
   [services.concurrency]
+    type = "connections"
     hard_limit = 25
     soft_limit = 20
-    type = "connections"
-
-  [[services.ports]]
-    force_https = true
-    handlers = ["http"]
-    port = 80
-
-  [[services.ports]]
-    handlers = ["tls", "http"]
-    port = 443
 
   [[services.tcp_checks]]
-    grace_period = "1s"
     interval = "15s"
-    restart_limit = 0
     timeout = "2s"
+    grace_period = "1s"
+    restart_limit = 0