fix nextcloud with local server code
This commit is contained in:
parent
68f86e0586
commit
b8eb294e92
2 changed files with 19 additions and 4 deletions
3
Makefile
3
Makefile
|
|
@ -1,9 +1,12 @@
|
|||
all:
|
||||
git submodule update --init
|
||||
# Build server
|
||||
cd server && git submodule update --init
|
||||
cd server && make dev-setup
|
||||
cd server && make build-js
|
||||
cd server && npm run sass
|
||||
cd calendar && make dev-setup
|
||||
cd calendar && make build-js
|
||||
|
||||
clean:
|
||||
rm nixos.qcow2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,17 @@
|
|||
# Todo
|
||||
# - Creating symlink to config dir
|
||||
# - Patch chgrp in Nextcloud module
|
||||
|
||||
{ pkgs, config, lib, options, ... }:{
|
||||
|
||||
disabledModules = [
|
||||
"services/web-apps/nextcloud.nix"
|
||||
];
|
||||
|
||||
imports = [
|
||||
./nextcloud.nix
|
||||
];
|
||||
|
||||
nixpkgs = {
|
||||
overlays = [
|
||||
(self: super: {
|
||||
|
|
@ -29,6 +41,7 @@
|
|||
adminuser = "admin";
|
||||
adminpassFile = "${pkgs.writeText "adminpass" "test123"}";
|
||||
};
|
||||
appstoreEnable = false;
|
||||
extraOptions = {
|
||||
mail_smtpmode = "sendmail";
|
||||
mail_sendmailmode = "pipe";
|
||||
|
|
@ -36,7 +49,7 @@
|
|||
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 = {
|
||||
"/var/lib/nextcloud/store-apps/calendar" = {
|
||||
target = ./calendar;
|
||||
|
|
@ -106,7 +119,6 @@
|
|||
|
||||
rm /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 = {
|
||||
Type = "oneshot";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue