Fixing all warnings
This commit is contained in:
parent
32720ae712
commit
169912a47b
15 changed files with 124 additions and 92 deletions
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
services.nextcloud = {
|
||||
enable = true;
|
||||
package = pkgs.nextcloud32;
|
||||
package = pkgs.nextcloud33;
|
||||
hostName = "cloud.lyes.eu";
|
||||
https = true;
|
||||
configureRedis = true;
|
||||
|
|
@ -15,7 +15,8 @@
|
|||
|
||||
extraAppsEnable = true;
|
||||
extraApps = {
|
||||
inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks news dav_push repod gpoddersync phonetrack music;
|
||||
inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks dav_push repod gpoddersync phonetrack music;
|
||||
# inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks news dav_push repod gpoddersync phonetrack music;
|
||||
# gpoddersync = pkgs.fetchNextcloudApp {
|
||||
# hash = "sha256-EQVs1fe0ierjqFZ5+KVc1Yj67zrwjLBAzY5A+QsC7AU=";
|
||||
# url = "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.13.2r/gpoddersync.tar.gz";
|
||||
|
|
|
|||
|
|
@ -42,6 +42,8 @@
|
|||
};
|
||||
};
|
||||
|
||||
networking.vpn-netns.encapsulatedServices.suwayomi-server.enable = true;
|
||||
|
||||
age.secrets = {
|
||||
suwayomi-pass = {
|
||||
file = ../../../secrets/zora/services/lanayru-pass.age;
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@
|
|||
|
||||
{
|
||||
services.kanidm = {
|
||||
package = pkgs.kanidmWithSecretProvisioning_1_8;
|
||||
package = pkgs.kanidmWithSecretProvisioning_1_9;
|
||||
|
||||
enableClient = true;
|
||||
|
||||
clientSettings = {
|
||||
uri = "https://auth.lyes.eu";
|
||||
client = {
|
||||
enable = true;
|
||||
settings = {
|
||||
uri = "https://auth.lyes.eu";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,19 +13,21 @@ in
|
|||
services.kanidm = {
|
||||
# package = pkgs.kanidmWithSecretProvisioning_1_7;
|
||||
|
||||
enableServer = true;
|
||||
serverSettings = {
|
||||
bindaddress = "127.0.0.1:${port}";
|
||||
ldapbindaddress = "0.0.0.0:636";
|
||||
domain = hostname;
|
||||
origin = "https://${hostname}";
|
||||
tls_chain = "/var/lib/acme/${hostname}/cert.pem";
|
||||
tls_key = "/var/lib/acme/${hostname}/key.pem";
|
||||
server = {
|
||||
enable = true;
|
||||
settings = {
|
||||
bindaddress = "127.0.0.1:${port}";
|
||||
ldapbindaddress = "0.0.0.0:636";
|
||||
domain = hostname;
|
||||
origin = "https://${hostname}";
|
||||
tls_chain = "/var/lib/acme/${hostname}/cert.pem";
|
||||
tls_key = "/var/lib/acme/${hostname}/key.pem";
|
||||
|
||||
online_backup = {
|
||||
path = "/var/data/backups/kanidm";
|
||||
schedule = "00 06 * * *";
|
||||
versions = 5;
|
||||
online_backup = {
|
||||
path = "/var/data/backups/kanidm";
|
||||
schedule = "00 06 * * *";
|
||||
versions = 5;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@ let
|
|||
} forwardedServices;
|
||||
|
||||
serviceList = lib.mapAttrsToList (name: _: name + ".service") forwardedServices;
|
||||
encServicesList = lib.mapAttrsToList (name: _: name + ".service") cfg.encapsulatedServices;
|
||||
|
||||
in
|
||||
lib.mkIf (forwardedServices != { } && cfg.portForwarding.enable) {
|
||||
assertions = [
|
||||
|
|
@ -49,8 +51,8 @@ lib.mkIf (forwardedServices != { } && cfg.portForwarding.enable) {
|
|||
services.natpmpc-lease = {
|
||||
description = "Request VPN port forwarding leases.";
|
||||
|
||||
wantedBy = serviceList;
|
||||
after = [ "wireguard.target" ];
|
||||
# wantedBy = serviceList;
|
||||
after = [ "wireguard.target" ] ++ encServicesList;
|
||||
wants = [ "wireguard.target" ];
|
||||
|
||||
# preStart = "sleep 3";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue