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

fix nextcloud with local server code

Browse source
This commit is contained in:
Jonas Heinrich 2023-01-02 11:56:11 +01:00
parent 68f86e0586
commit b8eb294e92
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -1,9 +1,12 @@
all: all:
git submodule update --init git submodule update --init
# Build server
cd server && git submodule update --init cd server && git submodule update --init
cd server && make dev-setup cd server && make dev-setup
cd server && make build-js cd server && make build-js
cd server && npm run sass cd server && npm run sass
cd calendar && make dev-setup
cd calendar && make build-js
clean: clean:
rm nixos.qcow2 rm nixos.qcow2

16
vm-nextcloud.nix
View file

@ -1,5 +1,17 @@
# Todo
# - Creating symlink to config dir
# - Patch chgrp in Nextcloud module
{ pkgs, config, lib, options, ... }:{ { pkgs, config, lib, options, ... }:{
disabledModules = [
"services/web-apps/nextcloud.nix"
];
imports = [
./nextcloud.nix
];
nixpkgs = { nixpkgs = {
overlays = [ overlays = [
(self: super: { (self: super: {
@ -29,6 +41,7 @@
adminuser = "admin"; adminuser = "admin";
adminpassFile = "${pkgs.writeText "adminpass" "test123"}"; adminpassFile = "${pkgs.writeText "adminpass" "test123"}";
}; };
appstoreEnable = false;
extraOptions = { extraOptions = {
mail_smtpmode = "sendmail"; mail_smtpmode = "sendmail";
mail_sendmailmode = "pipe"; mail_sendmailmode = "pipe";
@ -36,7 +49,7 @@
trusted_domains = [ "10.100.100.1" ]; trusted_domains = [ "10.100.100.1" ];
}; };
}; };
# Mount our local development app repository into the VM # Mount our local development repositories into the VM
nixos-shell.mounts.extraMounts = { nixos-shell.mounts.extraMounts = {
"/var/lib/nextcloud/store-apps/calendar" = { "/var/lib/nextcloud/store-apps/calendar" = {
target = ./calendar; target = ./calendar;
@ -106,7 +119,6 @@
rm /var/lib/nextcloud/apps rm /var/lib/nextcloud/apps
ln -s /var/lib/nextcloud/server/apps /var/lib/nextcloud/apps ln -s /var/lib/nextcloud/server/apps /var/lib/nextcloud/apps
#ln -fs /var/lib/nextcloud/config /var/lib/nextcloud/server/config
''; '';
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";