Merge remote-tracking branch 'upstream/next' into feature/glitchtip-service

# Conflicts:
#	apps/api/prisma/schema.prisma
#	apps/api/src/lib/common.ts
#	apps/api/src/lib/serviceFields.ts
#	apps/api/src/routes/api/v1/services/handlers.ts

apps/api/prisma/schema.prisma

@@ -323,6 +323,7 @@ model Service {
   createdAt           DateTime                   @default(now())
   updatedAt           DateTime                   @updatedAt
   destinationDocker   DestinationDocker?         @relation(fields: [destinationDockerId], references: [id])
+
   fider               Fider?
   ghost               Ghost?
   glitchTip           GlitchTip?
@@ -336,7 +337,9 @@ model Service {
   umami               Umami?
   vscodeserver        Vscodeserver?
   wordpress           Wordpress?
-  teams               Team[]
+  appwrite            Appwrite?
+
+  teams Team[]
 }
 
 model PlausibleAnalytics {
@@ -493,6 +496,25 @@ model Moodle {
   service                 Service  @relation(fields: [serviceId], references: [id])
 }
 
+model Appwrite {
+  id                      String   @id @default(cuid())
+  serviceId               String   @unique
+  opensslKeyV1            String
+  executorSecret          String
+  redisPassword           String
+  mariadbHost             String?
+  mariadbPort             Int      @default(3306)
+  mariadbUser             String
+  mariadbPassword         String
+  mariadbRootUser         String
+  mariadbRootUserPassword String
+  mariadbDatabase         String
+  mariadbPublicPort       Int?
+  createdAt               DateTime @default(now())
+  updatedAt               DateTime @updatedAt
+  service                 Service  @relation(fields: [serviceId], references: [id])
+}
+
 model GlitchTip {
   id                         String   @id @default(cuid())
   postgresqlUser             String