Merge branch 'master' of server into zenix
This commit is contained in:
commit
21eed9ef87
3 changed files with 3 additions and 2 deletions
|
|
@ -101,7 +101,6 @@ in {
|
|||
"/mnt/disk1/SnapRAID.content"
|
||||
"/mnt/disk2/SnapRAID.content"
|
||||
"/mnt/disk3/SnapRAID.content"
|
||||
"/var/snapraid/SnapRAID.content"
|
||||
];
|
||||
dataDisks = {
|
||||
d1 = "/mnt/disk1";
|
||||
|
|
@ -132,6 +131,7 @@ in {
|
|||
recommendedOptimisation = true;
|
||||
recommendedGzipSettings = true;
|
||||
virtualHosts = {
|
||||
"cerysb.art".globalRedirect = "instagram.com/cerys.bcreates";
|
||||
"*.tristans.cloud" = {
|
||||
globalRedirect = "tristans.cloud";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ in {
|
|||
};
|
||||
extraApps = {
|
||||
inherit (config.services.nextcloud.package.packages.apps)
|
||||
contacts calendar mail gpoddersync memories notes maps;
|
||||
contacts calendar mail gpoddersync memories notes maps previewgenerator;
|
||||
oidc_login = pkgs.fetchNextcloudApp {
|
||||
sha256 = "sha256-cN5azlThKPKRVip14yfUNR85of5z+N6NVI7sg6pSGQI=";
|
||||
url = "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.0.2/oidc_login.tar.gz";
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ in {
|
|||
};
|
||||
encryption = {
|
||||
allow = true;
|
||||
appservice = false;
|
||||
};
|
||||
personal_filtering_spaces = true;
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue