fix linter errors

This commit is contained in:
Jonas Heinrich 2023-10-04 12:27:09 +02:00
parent bd15bb380a
commit d051537529
4 changed files with 34 additions and 15 deletions

1
.vscode/launch.json vendored
View file

@ -15,6 +15,7 @@
"/var/lib/nextcloud/server": "${workspaceRoot}/server",
"/var/lib/nextcloud/server/apps/dav": "${workspaceRoot}/server/apps/dav",
"/var/lib/nextcloud/dev-apps/circles": "${workspaceRoot}/circles",
"/var/lib/nextcloud/store-apps/calendar": "${workspaceRoot}/calendar",
},
}
]

@ -1 +1 @@
Subproject commit a5d19d4fae91e53f22ef18be3f89104daa368dae
Subproject commit 8394e9828f06f5f5c2044b3cd5c1aacda7ddb699

12
flake.lock generated
View file

@ -5,11 +5,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1689431009,
"narHash": "sha256-hPgQCRWP5q/Xc4qOIP3c2krR9nQua78+t9EDiuey5nc=",
"lastModified": 1695272228,
"narHash": "sha256-4uw2OdJPVyjdB+xcDst9SecrNIpxKXJ2usN3M5HVa7o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "af8279f65fe71ce5a448408034a8c06e2b4b2c66",
"rev": "55ac2a9d2024f15c56adf20da505b29659911da8",
"type": "github"
},
"original": {

View file

@ -14,7 +14,8 @@
"services/web-apps/nextcloud.nix"
];
imports = [
./nextcloud.nix ];
"${fetchTarball "https://github.com/onny/nixpkgs/archive/nextcloud-ensureusers.tar.gz"}/nixos/modules/services/web-apps/nextcloud.nix"
];
nixpkgs = {
overlays = [
@ -78,6 +79,7 @@
mail_smtpmode = "sendmail";
mail_sendmailmode = "pipe";
trusted_domains = [ "10.100.100.1" ];
integrity.check.disabled = true;
apps_paths = [
{
path = "/var/lib/nextcloud/nix-apps";
@ -89,25 +91,26 @@
url = "/apps";
writable = false;
}
#{
# path = "/var/lib/nextcloud/dev-apps";
# url = "/dev-apps";
# writable = false;
#}
{
path = "/var/lib/nextcloud/store-apps";
url = "/store-apps";
writable = true;
}
];
};
};
# Mount our local development repositories into the VM
nixos-shell.mounts.extraMounts = {
"/var/lib/nextcloud/store-apps/calendar" = {
"/var/lib/nextcloud/calendar" = {
target = ./calendar;
cache = "none";
};
};
#"/var/lib/nextcloud/server" = {
# target = ./server;
# cache = "none";
#};
};
#};
# "/var/lib/nextcloud/server/3rdparty/sabre/dav" = {
# target = ./dav;
# cache = "none";
@ -155,6 +158,21 @@
};
};
# FIXME: need to create /var/lib/nextcloud/store-apps before
# with correct permissions
systemd.mounts = [
{
what = "/var/lib/nextcloud/calendar";
where = "/var/lib/nextcloud/store-apps/calendar";
type = "fuse.bindfs";
options = "uid=997,gid=997";
wantedBy = [ "multi-user.target" ];
enable = true;
}
];
system.fsPackages = [ pkgs.bindfs ];
system.stateVersion = "23.05";
documentation = {