Compare commits
No commits in common. "8cde2f28fbe18a207a8b95f3a5034a975aea9398" and "c805cc3dcb7e82e0a712005fd6711d736ac1114e" have entirely different histories.
8cde2f28fb
...
c805cc3dcb
12
flake.lock
generated
12
flake.lock
generated
@ -23,11 +23,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-unstable": {
|
"nixos-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686226982,
|
"lastModified": 1685931219,
|
||||||
"narHash": "sha256-nLuiPoeiVfqqzeq9rmXxpybh77VS37dsY/k8N2LoxVg=",
|
"narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a64b73e07d4aa65cfcbda29ecf78eaf9e72e44bd",
|
"rev": "7409480d5c8584a1a83c422530419efe4afb0d19",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -39,11 +39,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686353867,
|
"lastModified": 1686059680,
|
||||||
"narHash": "sha256-M6fe0+CiZTagmr2KM1pEaB+wwlSC+FY7nTJ4FGRctsw=",
|
"narHash": "sha256-sp0WlCIeVczzB0G8f8iyRg3IYW7KG31mI66z7HIZwrI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "bdbe3803330045c7b3f84b9df6ab7f8471d909ec",
|
"rev": "a558f7ac29f50c4b937fb5c102f587678ae1c9fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -2,6 +2,11 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
domain = "htdel.giugl.io";
|
domain = "htdel.giugl.io";
|
||||||
|
auth_block = (import ./openid.nix { inherit lib; }).openresty_oidc_block;
|
||||||
|
|
||||||
|
utilities = import ./utilities.nix { inherit lib config; };
|
||||||
|
inherit (utilities) architectInterfaceAddress;
|
||||||
|
|
||||||
listenPorts = [ 51413 51414 ];
|
listenPorts = [ 51413 51414 ];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
@ -36,22 +41,25 @@ in
|
|||||||
authFile = "/secrets/deluge/auth";
|
authFile = "/secrets/deluge/auth";
|
||||||
extraPackages = [ pkgs.unrar ];
|
extraPackages = [ pkgs.unrar ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nginx.virtualHosts.${domain} = {
|
||||||
|
forceSSL = true;
|
||||||
|
enableACME = true;
|
||||||
|
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://127.0.0.1:8112";
|
||||||
|
extraConfig = auth_block {
|
||||||
|
access_role = "deluge";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
architect.vhost.${domain} = with config.architect.networks; {
|
networking.extraHosts = ''
|
||||||
dnsInterfaces = [ "lan" "wireguard" "tailscale" ];
|
${architectInterfaceAddress "lan"} ${domain}
|
||||||
locations = {
|
${architectInterfaceAddress "wireguard"} ${domain}
|
||||||
"/" = {
|
${architectInterfaceAddress "tailscale"} ${domain}
|
||||||
allowLan = true;
|
'';
|
||||||
port = 8112;
|
|
||||||
|
|
||||||
allow = [
|
|
||||||
wireguard.net
|
|
||||||
tailscale.net
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
users.groups.media.members = [ "deluge" ];
|
users.groups.media.members = [ "deluge" ];
|
||||||
}
|
}
|
||||||
|
@ -8,12 +8,6 @@ let
|
|||||||
inherit (utilities) architectInterfaceAddress;
|
inherit (utilities) architectInterfaceAddress;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
nodejs-18_x
|
|
||||||
libtensorflow
|
|
||||||
ffmpeg
|
|
||||||
];
|
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
nginx.virtualHosts.${domain} = {
|
nginx.virtualHosts.${domain} = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
@ -22,7 +16,7 @@ in
|
|||||||
|
|
||||||
mysql = {
|
mysql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.mariadb_1011;
|
package = pkgs.mariadb;
|
||||||
};
|
};
|
||||||
|
|
||||||
redis = {
|
redis = {
|
||||||
@ -57,6 +51,7 @@ in
|
|||||||
dbname = "nextcloud";
|
dbname = "nextcloud";
|
||||||
dbpassFile = "/secrets/nextcloud/dbpass.txt";
|
dbpassFile = "/secrets/nextcloud/dbpass.txt";
|
||||||
adminpassFile = "/secrets/nextcloud/dbpass.txt";
|
adminpassFile = "/secrets/nextcloud/dbpass.txt";
|
||||||
|
extraTrustedDomains = [ "${domain}" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -11,8 +11,7 @@
|
|||||||
plugins = [ "git" "sudo" "docker" "docker-compose" "adb" "systemd" ];
|
plugins = [ "git" "sudo" "docker" "docker-compose" "adb" "systemd" ];
|
||||||
theme = "bira";
|
theme = "bira";
|
||||||
};
|
};
|
||||||
enableAutosuggestions = true;
|
|
||||||
dotDir = ".config/zsh";
|
|
||||||
initExtra = ''
|
initExtra = ''
|
||||||
any-nix-shell zsh --info-right | source /dev/stdin
|
any-nix-shell zsh --info-right | source /dev/stdin
|
||||||
source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
|
source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user