schrottkatze/nix-configs
1
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updated name of karton/microbin

Browse source
This commit is contained in:
Schrottkatze 2023-03-06 20:00:42 +01:00
parent 9454826593
commit 57befddf44
4 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -17,7 +17,7 @@
easymacros.url = "git+https://gitlab.com/obsidianical/easymacros.git"; easymacros.url = "git+https://gitlab.com/obsidianical/easymacros.git";
meowsite.url = "git+https://gitlab.com/obsidianical/meowsite.git"; meowsite.url = "git+https://gitlab.com/obsidianical/meowsite.git";
wordsofgod.url = "git+https://gitlab.com/obsidianical/wordsofgod.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"; arion.url = "github:hercules-ci/arion";
}; };

26
schrottserver/microbin.nix
View file

@ -1,27 +1,27 @@
{ inputs, config, pkgs, ... }: { inputs, config, pkgs, ... }:
{ {
environment.systemPackages = [ inputs.microbin-fork.defaultPackage."x86_64-linux" ]; environment.systemPackages = [ inputs.karton.defaultPackage."x86_64-linux" ];
systemd.services.microbin = { systemd.services.karton = {
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment = { environment = {
#MICROBIN_AUTH_USERNAME = "jade"; #MICROBIN_AUTH_USERNAME = "jade";
MICROBIN_HASH_IDS = ""; KARTON_HASH_IDS = "";
MICROBIN_EDITABLE = ""; KARTON_EDITABLE = "";
MICROBIN_PRIVATE = ""; KARTON_PRIVATE = "";
MICROBIN_HIGHLIGHTSYNTAX = ""; KARTON_HIGHLIGHTSYNTAX = "";
MICROBIN_PUBLIC_PATH = "https://s10e.de"; KARTON_PUBLIC_PATH = "https://s10e.de";
MICROBIN_QR = ""; KARTON_QR = "";
MICROBIN_URL_EP = "u"; KARTON_URL_EP = "u";
MICROBIN_RAW_EP = "r"; KARTON_RAW_EP = "r";
MICROBIN_PASTA_EP = "p"; 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"; #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 = { serviceConfig = {
Type = "simple"; Type = "simple";
RootDirectory="/"; RootDirectory="/";
WorkingDirectory = "/microbin"; WorkingDirectory = "/karton";
}; };
}; };
} }

17
schrottserver/penpot.nix
View file

@ -9,23 +9,30 @@
services = { services = {
"penpot-backend".service = { "penpot-backend".service = {
image = "penpotapp/backend:latest"; image = "penpotapp/backend:latest";
volumes = [ "/penpot_assets:/opt/data/assets" ]; volumes = [ "/penpot_assets:/var/lib/penpot/data/assets" ];
restart = "always"; restart = "always";
depends_on = [ "penpot-postgres" "penpot-redis" ]; depends_on = [ "penpot-postgres" "penpot-redis" ];
networks = [ "penpot" ]; networks = [ "penpot" ];
environment = { environment = {
"PENPOT_FLAGS" = "enable-registration enable-login-with-password disable-email-verification enable-smtp enable-prepl-server"; "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_PUBLIC_URI" = "https://pp.schrottkatze.de";
"PENPOT_DATABASE_URI" = "postgresql://penpot-postgres/penpot"; "PENPOT_DATABASE_URI" = "postgresql://penpot-postgres/penpot";
"PENPOT_DATABASE_USERNAME" = "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_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_TELEMETRY_ENABLED" = "false";
"PENPOT_SMTP_DEFAULT_FROM" = "noreply-pp@schrottkatze.de"; "PENPOT_SMTP_DEFAULT_FROM" = "noreply-pp@schrottkatze.de";
"PENPOT_SMTP_DEFAULT_REPLY_TO" = "noreply-pp@schrottkatze.de"; "PENPOT_SMTP_DEFAULT_REPLY_TO" = "noreply-pp@schrottkatze.de";
"PENPOT_SMTP_HOST" = "smtp.migadu.com"; "PENPOT_SMTP_HOST" = "smtp.migadu.com";
"PENPOT_SMTP_PORT" = "465"; "PENPOT_SMTP_PORT" = "587";
"PENPOT_SMTP_USERNAME" = "noreply-pp@schrottkatze.de"; "PENPOT_SMTP_USERNAME" = "noreply-pp@schrottkatze.de";
"PENPOT_SMTP_PASSWORD" = builtins.readFile ../secret-data/penpot-smtp-pass; "PENPOT_SMTP_PASSWORD" = builtins.readFile ../secret-data/penpot-smtp-pass;
"PENPOT_SMTP_TLS" = "true"; "PENPOT_SMTP_TLS" = "true";
@ -36,7 +43,7 @@
image = "penpotapp/frontend:latest"; image = "penpotapp/frontend:latest";
restart = "always"; restart = "always";
ports = [ "9001:80" ]; ports = [ "9001:80" ];
volumes = [ "/penpot_assets:/opt/data/assets" ]; volumes = [ "/penpot_assets:/var/lib/penpot/data/assets" ];
depends_on = [ "penpot-backend" "penpot-exporter" ]; depends_on = [ "penpot-backend" "penpot-exporter" ];
networks = [ "penpot" ]; networks = [ "penpot" ];
}; };

1
schrottserver/proxy.nix
View file

@ -72,6 +72,7 @@
enableACME = true; enableACME = true;
locations."/" = { locations."/" = {
proxyPass = "http://localhost:9001"; proxyPass = "http://localhost:9001";
proxyWebsockets = true;
}; };
}; };
"s10e.de" = { "s10e.de" = {