From 57befddf44109aadac87a66be6516804b55b0d05 Mon Sep 17 00:00:00 2001
From: Jade <jade@schrottkatze.de>
Date: Mon, 6 Mar 2023 20:00:42 +0100
Subject: [PATCH] updated name of karton/microbin

---
 flake.nix                  |  2 +-
 schrottserver/microbin.nix | 26 +++++++++++++-------------
 schrottserver/penpot.nix   | 17 ++++++++++++-----
 schrottserver/proxy.nix    |  1 +
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8c2ac83..556f581 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
     easymacros.url = "git+https://gitlab.com/obsidianical/easymacros.git";
     meowsite.url = "git+https://gitlab.com/obsidianical/meowsite.git";
     wordsofgod.url = "git+https://gitlab.com/obsidianical/wordsofgod.git";
-    microbin-fork.url = "git+https://gitlab.com/obsidianical/microbin.git";
+    karton.url = "git+https://gitlab.com/obsidianical/microbin.git";
     arion.url = "github:hercules-ci/arion";
   };
 
diff --git a/schrottserver/microbin.nix b/schrottserver/microbin.nix
index 335b8a8..d2d3ae2 100644
--- a/schrottserver/microbin.nix
+++ b/schrottserver/microbin.nix
@@ -1,27 +1,27 @@
 { inputs, config, pkgs, ... }:
 {
-  environment.systemPackages = [ inputs.microbin-fork.defaultPackage."x86_64-linux" ];
-  systemd.services.microbin = {
+  environment.systemPackages = [ inputs.karton.defaultPackage."x86_64-linux" ];
+  systemd.services.karton = {
     after = [ "network.target" ];
     wantedBy = [ "multi-user.target" ];
     environment = {
       #MICROBIN_AUTH_USERNAME = "jade";
-      MICROBIN_HASH_IDS = "";
-      MICROBIN_EDITABLE = "";
-      MICROBIN_PRIVATE = "";
-      MICROBIN_HIGHLIGHTSYNTAX = "";
-      MICROBIN_PUBLIC_PATH = "https://s10e.de";
-      MICROBIN_QR = "";
-      MICROBIN_URL_EP = "u";
-      MICROBIN_RAW_EP = "r";
-      MICROBIN_PASTA_EP = "p";
+      KARTON_HASH_IDS = "";
+      KARTON_EDITABLE = "";
+      KARTON_PRIVATE = "";
+      KARTON_HIGHLIGHTSYNTAX = "";
+      KARTON_PUBLIC_PATH = "https://s10e.de";
+      KARTON_QR = "";
+      KARTON_URL_EP = "u";
+      KARTON_RAW_EP = "r";
+      KARTON_PASTA_EP = "p";
     };
-    script = "${inputs.microbin-fork.defaultPackage."x86_64-linux"}/bin/microbin";
+    script = "${inputs.karton.defaultPackage."x86_64-linux"}/bin/karton";
     #scriptArgs = "--auth-password ${builtins.readFile ../secret-data/mb-pass} --auth-username jade --editable --hash-ids --no-listing --highlightsyntax --public-path https://s10e.de --qr";
     serviceConfig = {
       Type = "simple";
       RootDirectory="/";
-      WorkingDirectory = "/microbin";
+      WorkingDirectory = "/karton";
     };
   };
 }
diff --git a/schrottserver/penpot.nix b/schrottserver/penpot.nix
index 836a238..1f4f18e 100644
--- a/schrottserver/penpot.nix
+++ b/schrottserver/penpot.nix
@@ -9,23 +9,30 @@
       services = {
         "penpot-backend".service = {
           image = "penpotapp/backend:latest";
-          volumes = [ "/penpot_assets:/opt/data/assets" ];
+          volumes = [ "/penpot_assets:/var/lib/penpot/data/assets" ];
           restart = "always";
           depends_on = [ "penpot-postgres" "penpot-redis" ];
           networks = [ "penpot" ];
           environment = {
             "PENPOT_FLAGS" = "enable-registration enable-login-with-password disable-email-verification enable-smtp enable-prepl-server";
+            "PENPOT_PREPL_HOST" = "0.0.0.0";
+
             "PENPOT_PUBLIC_URI" = "https://pp.schrottkatze.de";
+
             "PENPOT_DATABASE_URI" = "postgresql://penpot-postgres/penpot";
             "PENPOT_DATABASE_USERNAME" = "penpot";
-            "PENPOT_DATABASE_PASSWORD" = "penpot"; "PENPOT_REDIS_URI" = "redis://penpot-redis/0";
+            "PENPOT_DATABASE_PASSWORD" = "penpot"; 
+            "PENPOT_REDIS_URI" = "redis://penpot-redis/0";
+
             "PENPOT_ASSETS_STORAGE_BACKEND" = "assets-fs";
-            "PENPOT_STORAGE_ASSETS_FS_DIRECTORY" = "/opt/data/assets";
+            "PENPOT_STORAGE_ASSETS_FS_DIRECTORY" = "/var/lib/penpot/data/assets";
+
             "PENPOT_TELEMETRY_ENABLED" = "false";
+
             "PENPOT_SMTP_DEFAULT_FROM" = "noreply-pp@schrottkatze.de";
             "PENPOT_SMTP_DEFAULT_REPLY_TO" = "noreply-pp@schrottkatze.de";
             "PENPOT_SMTP_HOST" = "smtp.migadu.com";
-            "PENPOT_SMTP_PORT" = "465";
+            "PENPOT_SMTP_PORT" = "587";
             "PENPOT_SMTP_USERNAME" = "noreply-pp@schrottkatze.de";
             "PENPOT_SMTP_PASSWORD" = builtins.readFile ../secret-data/penpot-smtp-pass;
             "PENPOT_SMTP_TLS" = "true";
@@ -36,7 +43,7 @@
           image = "penpotapp/frontend:latest";
           restart = "always";
           ports = [  "9001:80" ];
-          volumes = [ "/penpot_assets:/opt/data/assets" ];
+          volumes = [ "/penpot_assets:/var/lib/penpot/data/assets" ];
           depends_on = [ "penpot-backend" "penpot-exporter" ];
           networks = [ "penpot" ];
         };
diff --git a/schrottserver/proxy.nix b/schrottserver/proxy.nix
index 67b8c81..28b5525 100644
--- a/schrottserver/proxy.nix
+++ b/schrottserver/proxy.nix
@@ -72,6 +72,7 @@
         enableACME = true;
         locations."/" = {
           proxyPass = "http://localhost:9001";
+          proxyWebsockets = true;
         };
       };
       "s10e.de" = {