Compare commits
No commits in common. "5e96a9fcca2e30d90e0ec5bb11898ff876d6c1f9" and "87bdc15245f4304968c6e9994dde276e49036573" have entirely different histories.
5e96a9fcca
...
87bdc15245
|
@ -71,6 +71,6 @@ in
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
kdePackages.ark
|
kdePackages.ark
|
||||||
];
|
];
|
||||||
programs.kdeconnect.enable = true;
|
|
||||||
materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin pkgs.vlc ];
|
materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin pkgs.vlc ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,7 +65,6 @@
|
||||||
http_url = "https://mamba.podkos.pl";
|
http_url = "https://mamba.podkos.pl";
|
||||||
ldap_user_dn = "master";
|
ldap_user_dn = "master";
|
||||||
ldap_user_email = "materus@podkos.pl";
|
ldap_user_email = "materus@podkos.pl";
|
||||||
ldap_port = 3890;
|
|
||||||
key_seed = materusArg.waffentrager.lldap.seed;
|
key_seed = materusArg.waffentrager.lldap.seed;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
./nextcloud.nix
|
./nextcloud.nix
|
||||||
./samba.nix
|
./samba.nix
|
||||||
./syncthing.nix
|
./syncthing.nix
|
||||||
./jellyfin.nix
|
|
||||||
./auth
|
./auth
|
||||||
];
|
];
|
||||||
waffentragerService.elements.enable = true;
|
waffentragerService.elements.enable = true;
|
||||||
|
@ -20,6 +19,5 @@
|
||||||
waffentragerService.nginx.enable = true;
|
waffentragerService.nginx.enable = true;
|
||||||
waffentragerService.nextcloud.enable = true;
|
waffentragerService.nextcloud.enable = true;
|
||||||
waffentragerService.samba.enable = true;
|
waffentragerService.samba.enable = true;
|
||||||
waffentragerService.jellyfin.enable = true;
|
|
||||||
waffentragerService.syncthing.enable = true;
|
waffentragerService.syncthing.enable = true;
|
||||||
}
|
}
|
|
@ -6,7 +6,6 @@
|
||||||
options.waffentragerService.elements.postgresqlDir = lib.mkOption { default = "${config.waffentragerService.elements.path}/services/postgresql"; };
|
options.waffentragerService.elements.postgresqlDir = lib.mkOption { default = "${config.waffentragerService.elements.path}/services/postgresql"; };
|
||||||
options.waffentragerService.elements.nextcloudDir = lib.mkOption { default = "${config.waffentragerService.elements.path}/services/nextcloud"; };
|
options.waffentragerService.elements.nextcloudDir = lib.mkOption { default = "${config.waffentragerService.elements.path}/services/nextcloud"; };
|
||||||
options.waffentragerService.elements.lldapDir = lib.mkOption { default = "${config.waffentragerService.elements.path}/services/lldap"; };
|
options.waffentragerService.elements.lldapDir = lib.mkOption { default = "${config.waffentragerService.elements.path}/services/lldap"; };
|
||||||
options.waffentragerService.elements.jellyfinDir = lib.mkOption { default = "${config.waffentragerService.elements.path}/services/jellyfin"; };
|
|
||||||
config =
|
config =
|
||||||
let
|
let
|
||||||
cfg = config.waffentragerService.elements;
|
cfg = config.waffentragerService.elements;
|
||||||
|
@ -32,9 +31,6 @@
|
||||||
'' + lib.optionalString config.waffentragerService.auth.lldap.enable ''
|
'' + lib.optionalString config.waffentragerService.auth.lldap.enable ''
|
||||||
mkdir -p ${cfg.lldapDir}
|
mkdir -p ${cfg.lldapDir}
|
||||||
chown -R lldap:lldap ${cfg.lldapDir}
|
chown -R lldap:lldap ${cfg.lldapDir}
|
||||||
'' + lib.optionalString config.waffentragerService.jellyfin.enable ''
|
|
||||||
mkdir -p ${cfg.jellyfinDir}
|
|
||||||
chown -R materus:nextcloud ${cfg.jellyfinDir}
|
|
||||||
''
|
''
|
||||||
|
|
||||||
;
|
;
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
{ lib, config, materusArg, ... }:
|
|
||||||
{
|
|
||||||
options.waffentragerService.jellyfin.enable = materusArg.pkgs.lib.mkBoolOpt false "Enable jellyfin";
|
|
||||||
|
|
||||||
config =
|
|
||||||
let
|
|
||||||
cfg = config.waffentragerService.jellyfin;
|
|
||||||
in
|
|
||||||
lib.mkIf cfg.enable {
|
|
||||||
services.jellyfin = {
|
|
||||||
enable = true;
|
|
||||||
openFirewall = true;
|
|
||||||
user = "materus";
|
|
||||||
group = "nextcloud";
|
|
||||||
dataDir = config.waffentragerService.elements.jellyfinDir;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts = {
|
|
||||||
"noot.materus.pl" = {
|
|
||||||
sslTrustedCertificate = "/var/lib/mnt_acme/materus.pl/chain.pem";
|
|
||||||
sslCertificateKey = "/var/lib/mnt_acme/materus.pl/key.pem";
|
|
||||||
sslCertificate = "/var/lib/mnt_acme/materus.pl/fullchain.pem";
|
|
||||||
addSSL = true;
|
|
||||||
http2 = false;
|
|
||||||
http3 = true;
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://127.0.0.1:8096";
|
|
||||||
extraConfig = ''
|
|
||||||
client_max_body_size 2G;
|
|
||||||
include ${config.services.nginx.package}/conf/fastcgi.conf;
|
|
||||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-Ssl on;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Reference in New Issue