This commit is contained in:
2026-03-29 13:02:41 +03:00
parent 713bccc3b1
commit 7d731bd1c4
9 changed files with 63 additions and 58 deletions
+1
View File
@@ -0,0 +1 @@
* text=auto eol=lf
+6 -5
View File
@@ -61,8 +61,8 @@
"TZ" = "Europe/Moscow"; "TZ" = "Europe/Moscow";
}; };
volumes = [ volumes = [
"/mnt/containers/3x-ui/cert/:/root/cert:rw" "/mnt/services/containers/3x-ui/cert/:/root/cert:rw"
"/mnt/containers/3x-ui/db/:/etc/x-ui:rw" "/mnt/services/containers/3x-ui/db/:/etc/x-ui:rw"
]; ];
log-driver = "journald"; log-driver = "journald";
extraOptions = [ extraOptions = [
@@ -111,8 +111,9 @@
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d /mnt 0755 root root -" "d /mnt 0755 root root -"
"d /mnt/containers 0755 root root -" "d /mnt/containers 0755 root root -"
"d /mnt/containers/3x-ui 0755 root root -" "d /mnt/services/containers 0755 root root -"
"d /mnt/containers/3x-ui/cert 0755 root root -" "d /mnt/services/containers/3x-ui 0755 root root -"
"d /mnt/containers/3x-ui/db 0755 root root -" "d /mnt/services/containers/3x-ui/cert 0755 root root -"
"d /mnt/services/containers/3x-ui/db 0755 root root -"
]; ];
} }
+15
View File
@@ -0,0 +1,15 @@
{
config,
lib,
pkgs,
inputs,
xlib,
...
}:
{
systemd.tmpfiles.rules = [
"d ${xlib.dirs.services-mnt-folder} 0755 root root -"
"d ${xlib.dirs.services-mnt-folder}/containers 0755 root root -"
"d ${xlib.dirs.services-mnt-folder}/containers/remnanode 0755 root root -"
];
}
+5 -18
View File
@@ -7,22 +7,9 @@
... ...
}: }:
{ {
systemd.tmpfiles.rules = [
# fileSystems."${config.services.immich.mediaLocation}" = { "d ${xlib.dirs.services-mnt-folder} 0755 root root -"
# device = "${xlib.dirs.services-folder}/immich"; "d ${xlib.dirs.services-mnt-folder}/containers 0755 root root -"
# options = [ "d ${xlib.dirs.services-mnt-folder}/containers/remnawave 0755 root root -"
# "bind" ];
# "nofail"
# ];
# };
# systemd.tmpfiles.rules = [
# "z ${config.services.immich.mediaLocation} 0755 immich immich -"
# ];
# environment = {
# systemPackages = with pkgs; [
# immich-cli
# ];
# };
} }
+1
View File
@@ -4,6 +4,7 @@
}: }:
{ {
imports = [ imports = [
../containers/remnawave.nix
../software/beets ../software/beets
./calibre-web.nix ./calibre-web.nix
./immich.nix ./immich.nix
+1 -1
View File
@@ -4,7 +4,7 @@
}: }:
{ {
services.mealie = { services.mealie = {
enable = true; enable = false;
listenAddress = "0.0.0.0"; listenAddress = "0.0.0.0";
port = 9000; port = 9000;
database.createLocally = true; database.createLocally = true;
+1 -1
View File
@@ -5,7 +5,7 @@
}: }:
{ {
services.memos = { services.memos = {
enable = true; enable = false;
openFirewall = true; openFirewall = true;
settings = { settings = {
MEMOS_MODE = "prod"; MEMOS_MODE = "prod";
+32 -32
View File
@@ -89,11 +89,11 @@ in
music music
tasks tasks
# news # news
notes # notes
# notify_push # notify_push
polls polls
previewgenerator previewgenerator
richdocuments # richdocuments
spreed spreed
tables tables
user_oidc user_oidc
@@ -108,7 +108,7 @@ in
}; };
}; };
collabora-online = { collabora-online = {
enable = true; enable = false;
port = 9980; port = 9980;
# package = master.collabora-online; # package = master.collabora-online;
settings = { settings = {
@@ -141,36 +141,36 @@ in
# fonts.packages = [ work.corefonts ]; # fonts.packages = [ work.corefonts ];
networking.hosts = { # networking.hosts = {
"localhost" = [ "nextcloud-private.local" ]; # "localhost" = [ "nextcloud-private.local" ];
}; # };
systemd.services.nextcloud-config-collabora = # systemd.services.nextcloud-config-collabora =
let # let
inherit (config.services.nextcloud) occ; # inherit (config.services.nextcloud) occ;
wopi_url = "http://localhost:${toString config.services.collabora-online.port}"; # wopi_url = "http://localhost:${toString config.services.collabora-online.port}";
public_wopi_url = "https://office.zeroq.ru"; # public_wopi_url = "https://office.zeroq.ru";
wopi_allowlist = lib.concatStringsSep "," [ # wopi_allowlist = lib.concatStringsSep "," [
"0.0.0.0/0" # "0.0.0.0/0"
]; # ];
in # in
{ # {
wantedBy = [ "multi-user.target" ]; # wantedBy = [ "multi-user.target" ];
after = [ # after = [
"nextcloud-setup.service" # "nextcloud-setup.service"
"coolwsd.service" # "coolwsd.service"
]; # ];
requires = [ "coolwsd.service" ]; # requires = [ "coolwsd.service" ];
script = '' # script = ''
${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url} # ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url}
${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url} # ${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url}
${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist} # ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist}
${occ}/bin/nextcloud-occ richdocuments:setup # ${occ}/bin/nextcloud-occ richdocuments:setup
''; # '';
serviceConfig = { # serviceConfig = {
Type = "oneshot"; # Type = "oneshot";
}; # };
}; # };
# fileSystems."${config.services.nextcloud.home}" = { # fileSystems."${config.services.nextcloud.home}" = {
# device = "${xlib.dirs.services-folder}/nextcloud"; # device = "${xlib.dirs.services-folder}/nextcloud";
+1 -1
View File
@@ -8,7 +8,7 @@
}: }:
{ {
services.uptime-kuma = { services.uptime-kuma = {
enable = true; enable = false;
settings = { settings = {
PORT = "4001"; PORT = "4001";
HOST = "0.0.0.0"; HOST = "0.0.0.0";