onny/nixos-nextcloud-testumgebung
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add circles app

Browse source
This commit is contained in:
Jonas Heinrich 2023-07-25 18:29:15 +02:00
parent fef97d2ac9
commit 2d26a70252
6 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.vscode/launch.json vendored
View file

@ -14,7 +14,7 @@
"/var/lib/nextcloud/server/3rdparty/sabre/vobject": "${workspaceRoot}/vobject", "/var/lib/nextcloud/server/3rdparty/sabre/vobject": "${workspaceRoot}/vobject",
"/var/lib/nextcloud/server": "${workspaceRoot}/server", "/var/lib/nextcloud/server": "${workspaceRoot}/server",
"/var/lib/nextcloud/server/apps/dav": "${workspaceRoot}/server/apps/dav", "/var/lib/nextcloud/server/apps/dav": "${workspaceRoot}/server/apps/dav",
"/var/lib/nextcloud/dev-apps/circles": "${workspaceRoot}/circles",
}, },
} }
] ]

2
calendar

@ -1 +1 @@
Subproject commit e72d2259dc9a624771a417725c388de1ae57872d Subproject commit afb60be7d579fdaab9fac66a1228f7c16ea74a0e

2
circles

@ -1 +1 @@
Subproject commit f3b38fc5c96ce3f0c05b4df95a718724d109f6f1 Subproject commit e76bb81c384eecab6b36e66c277c1e835002ec54

2
server

@ -1 +1 @@
Subproject commit 8cfcb8e2a2f9ba1bbe993161f00d7dcebf07708f Subproject commit ab27e9508b7c399e7bae77d538f873395fe1334a

60
vm-nextcloud.nix
View file

@ -27,8 +27,8 @@
installPhase = oldAttrs.installPhase + '' installPhase = oldAttrs.installPhase + ''
mkdir -p $out/ mkdir -p $out/
cp -R . $out/ cp -R . $out/
#rm -r $out/apps/firstrunwizard rm -r $out/apps/firstrunwizard
#rm -r $out/apps/password_policy rm -r $out/apps/password_policy
rm -r $out/apps/circles rm -r $out/apps/circles
''; '';
dontBuild = true; dontBuild = true;
@ -42,10 +42,10 @@
enable = true; enable = true;
package = pkgs.nextcloud27; package = pkgs.nextcloud27;
hostName = "localhost"; hostName = "localhost";
#extraApps = with pkgs.nextcloud27Packages.apps; { extraApps = with config.services.nextcloud.package.packages.apps; {
# inherit activity; inherit calendar contacts;
#}; };
#extraAppsEnable = true; extraAppsEnable = true;
config = { config = {
adminuser = "admin"; adminuser = "admin";
adminpassFile = "${pkgs.writeText "adminpass" "test123"}"; adminpassFile = "${pkgs.writeText "adminpass" "test123"}";
@ -62,7 +62,7 @@
"xdebug.start_with_request" = "yes"; "xdebug.start_with_request" = "yes";
"xdebug.idekey" = "ECLIPSE"; "xdebug.idekey" = "ECLIPSE";
}; };
appstoreEnable = true; appstoreEnable = false;
configureRedis = true; configureRedis = true;
caching.apcu = false; caching.apcu = false;
extraOptions = { extraOptions = {
@ -88,30 +88,37 @@
"openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt"; "openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt";
catch_workers_output = "yes"; catch_workers_output = "yes";
}; };
# apps_paths = [ apps_paths = [
# { {
# path = "/var/lib/nextcloud/nix-apps"; path = "/var/lib/nextcloud/nix-apps";
# url = "/nix-apps"; url = "/nix-apps";
# writeable = false; writable = false;
# } }
# { {
# path = "/var/lib/nextcloud/server/apps"; path = "/var/lib/nextcloud/apps";
# url = "/apps"; url = "/apps";
# writeable = false; writable = false;
# } }
# ]; {
path = "/var/lib/nextcloud/dev-apps";
url = "/dev-apps";
writable = false;
}
];
}; };
}; };
# Mount our local development repositories into the VM # Mount our local development repositories into the VM
nixos-shell.mounts.extraMounts = { nixos-shell.mounts.extraMounts = {
"/var/lib/nextcloud/store-apps/circles" = { "/var/lib/nextcloud/dev-apps/circles" = {
target = ./circles; target = ./circles;
cache = "none"; cache = "none";
}; };
}; };
# "/var/lib/nextcloud/server" = { # #"/var/lib/nextcloud/server" = {
# target = ./server; # # target = ./server;
# cache = "none"; # # cache = "none";
# #};
#};
#}; #};
# "/var/lib/nextcloud/server/apps/calendar" = { # "/var/lib/nextcloud/server/apps/calendar" = {
# target = ./calendar; # target = ./calendar;
@ -138,7 +145,7 @@
"10.100.100.1" "10.100.100.1"
"127.0.0.1" "127.0.0.1"
]; ];
# Disable any sender validation checks # Disable any sender vhttps://github.com/obsidiansystems/ipfs-nix-guide/alidation checks
config = lib.concatStrings ( config = lib.concatStrings (
builtins.match "(.*)authorize_sender.*identity\n[ ]+\}(.*)" options.services.maddy.config.default builtins.match "(.*)authorize_sender.*identity\n[ ]+\}(.*)" options.services.maddy.config.default
); );
@ -177,11 +184,6 @@
${config.services.nextcloud.occ}/bin/nextcloud-occ user:add --password-from-env user2 ${config.services.nextcloud.occ}/bin/nextcloud-occ user:add --password-from-env user2
${config.services.nextcloud.occ}/bin/nextcloud-occ user:setting user2 settings email "user2@localhost" ${config.services.nextcloud.occ}/bin/nextcloud-occ user:setting user2 settings email "user2@localhost"
${config.services.nextcloud.occ}/bin/nextcloud-occ user:setting admin settings email "admin@localhost" ${config.services.nextcloud.occ}/bin/nextcloud-occ user:setting admin settings email "admin@localhost"
${config.services.nextcloud.occ}/bin/nextcloud-occ app:enable calendar
rm /var/lib/nextcloud/apps
ln -s /var/lib/nextcloud/server/apps /var/lib/nextcloud/apps
''; '';
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";

2
vobject

@ -1 +1 @@
Subproject commit 198196c9cfe436c8c0ee5637a5129a455c9bf404 Subproject commit ac56915f9b88a99118c0ee7f25d4338798514251