v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

minor updates

Browse source
This commit is contained in:
Vivian 2024-01-02 16:55:47 +01:00
parent 24dd2cce4f
commit 1142c6acac
5 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -254,11 +254,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1703864604, "lastModified": 1704204809,
"narHash": "sha256-XAqPLb7H5rcQMC9OeKlnUNVr8hte+1L1GeZC0ZR7akc=", "narHash": "sha256-O76nB41RyfedpCfcO4GU5i2Ng7ZUMbZnF+Ceq0e8LIs=",
"owner": "jdonszelmann", "owner": "jdonszelmann",
"repo": "essentials", "repo": "essentials",
"rev": "2da99cdc27364844a887ea1c6ed3146c84c15041", "rev": "8209683dc3c5edd747efccd187f512771d8f3a0c",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
nixos/common/modules/dns.nix
View file

@ -15,8 +15,7 @@ let
ptr6Data = { hostname, realm, ip6, ... }: ''"${ip6} ${hostname}.${realm}"''; ptr6Data = { hostname, realm, ip6, ... }: ''"${ip6} ${hostname}.${realm}"'';
cfg = config.services.v.dns; cfg = config.services.v.dns;
in in {
{
options.services.v.dns = { options.services.v.dns = {
enable = mkEnableOption "v.dns"; enable = mkEnableOption "v.dns";
@ -38,7 +37,7 @@ in
}; };
mode = mkOption { mode = mkOption {
type = types.strMatching "^(server|laptop)$"; type = enum [ "server" "laptop" ];
default = "laptop"; default = "laptop";
description = '' description = ''
Whether to configure the DNS in server mode (listen on all interfaces) or laptop mode (just on localhost) Whether to configure the DNS in server mode (listen on all interfaces) or laptop mode (just on localhost)
@ -60,7 +59,8 @@ in
services.unbound = { services.unbound = {
enable = true; enable = true;
package = pkgs.v.unbound; package = pkgs.v.unbound;
localControlSocketPath = mkIf cfg.enableMetrics "/run/unbound/unbound.socket"; localControlSocketPath =
mkIf cfg.enableMetrics "/run/unbound/unbound.socket";
settings = { settings = {
server = mkMerge [ server = mkMerge [
{ {

2
nixos/hosts/hades/jellyfin/configuration.nix
View file

@ -39,7 +39,6 @@
systemd.tmpfiles.rules = systemd.tmpfiles.rules =
[ "d '/var/lib/watchstate' 0755 watchstate watchstate -" ]; [ "d '/var/lib/watchstate' 0755 watchstate watchstate -" ];
networking.firewall.allowedTCPPorts = [ 8080 ]; networking.firewall.allowedTCPPorts = [ 8080 ];
# Managed imperatively through its CLI # Managed imperatively through its CLI
@ -51,6 +50,7 @@
WS_TZ = "Europe/Amsterdam"; WS_TZ = "Europe/Amsterdam";
WS_CRON_IMPORT = "1"; WS_CRON_IMPORT = "1";
WS_CRON_EXPORT = "1"; WS_CRON_EXPORT = "1";
WS_CRON_PROGRESS = "1";
}; };
ports = [ "8080:8080" ]; ports = [ "8080:8080" ];
volumes = [ "/var/lib/watchstate:/config:rw" ]; volumes = [ "/var/lib/watchstate:/config:rw" ];

8
nixos/hosts/hades/storage/configuration.nix
View file

@ -6,11 +6,12 @@
./fs.nix ./fs.nix
]; ];
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
services = { services = {
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
openssh.enable = true; # Did you read the comment? openssh.enable = true;
nfs.server = { nfs.server = {
enable = true; enable = true;
@ -22,10 +23,7 @@
snapraid = { snapraid = {
enable = true; enable = true;
parityFiles = parityFiles =
[ [ "/mnt/parity1/snapraid.parity" "/mnt/parity2/snapraid.parity" ];
"/mnt/parity1/snapraid.parity"
"/mnt/parity2/snapraid.parity"
];
dataDisks = { dataDisks = {
d1 = "/mnt/disk1"; d1 = "/mnt/disk1";
d2 = "/mnt/disk2"; d2 = "/mnt/disk2";

19
nixos/hosts/olympus/nginx/configuration.nix
View file

@ -13,8 +13,7 @@ let
add_header Access-Control-Allow-Origin *; add_header Access-Control-Allow-Origin *;
return 200 '${builtins.toJSON data}'; return 200 '${builtins.toJSON data}';
''; '';
in in {
{
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave # on your system were taken. It‘s perfectly fine and recommended to leave
@ -40,9 +39,15 @@ in
package = pkgs.nginxMainline; package = pkgs.nginxMainline;
commonHttpConfig = ''
types {
application/javascript mjs;
}
'';
# Templated # Templated
virtualHosts = { virtualHosts = {
"pass.0x76.dev" = { "pass.0x76.dev" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations = { locations = {
@ -66,8 +71,8 @@ in
forceSSL = true; forceSSL = true;
locations."/".extraConfig = '' locations."/".extraConfig = ''
add_header Content-Type 'text/html; charset=UTF-8'; add_header Content-Type 'text/html; charset=UTF-8';
return 200 '<h1>Under Construction</h1>'; return 200 '<h1>Under Construction</h1>';
''; '';
}; };
@ -76,8 +81,8 @@ in
forceSSL = true; forceSSL = true;
locations."/".extraConfig = '' locations."/".extraConfig = ''
add_header Content-Type 'text/html; charset=UTF-8'; add_header Content-Type 'text/html; charset=UTF-8';
return 200 '<h1>Under Construction</h1>'; return 200 '<h1>Under Construction</h1>';
''; '';
}; };