Cloonar/nixos
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
Dominik Polakovics Polakovics
2024-01-29 19:46:40 +01:00
parent b622a620be
commit 270880c4f2
12 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/fw.cloonar.com/modules/openconnect.nix
View File

@@ -15,6 +15,7 @@ in
protocol = "anyconnect"; protocol = "anyconnect";
user = "exdpolakovics@wrwks.local"; user = "exdpolakovics@wrwks.local";
extraOptions = { extraOptions = {
authgroup = "WRWKS-SSL-VPN-Service";
script = "${vpnc}"; script = "${vpnc}";
}; };
}; };

1
hosts/fw.cloonar.com/modules/unbound.nix
View File

@@ -29,6 +29,7 @@ let
"\"fw.cloonar.com A 10.42.97.1\"" "\"fw.cloonar.com A 10.42.97.1\""
"\"fw A 10.42.97.1\"" "\"fw A 10.42.97.1\""
"\"omada.cloonar.com IN A 10.42.97.2\""
"\"switch.cloonar.com IN A 10.42.97.10\"" "\"switch.cloonar.com IN A 10.42.97.10\""
"\"mopidy.cloonar.com IN A 10.42.97.20\"" "\"mopidy.cloonar.com IN A 10.42.97.20\""
"\"deconz.cloonar.com IN A 10.42.97.25\"" "\"deconz.cloonar.com IN A 10.42.97.25\""

46
hosts/nb-01.cloonar.com/configuration.nix
View File

@@ -31,6 +31,10 @@
"electron-24.8.6" "electron-24.8.6"
]; ];
fonts.packages = with pkgs; [
open-sans
];
virtualisation.waydroid.enable = true; virtualisation.waydroid.enable = true;
# security.sudo.wheelNeedsPassword = false; # security.sudo.wheelNeedsPassword = false;
@@ -187,27 +191,27 @@
ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN || true ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN || true
''; '';
}; };
networking.wireguard.interfaces = { # networking.wireguard.interfaces = {
wg0 = { # wg0 = {
# Determines the IP address and subnet of the client's end of the tunnel interface. # # Determines the IP address and subnet of the client's end of the tunnel interface.
ips = [ "10.42.98.201/32" ]; # ips = [ "10.42.98.201/32" ];
# Path to the private key file. # # Path to the private key file.
# # #
# Note: The private key can also be included inline via the privateKey option, # # Note: The private key can also be included inline via the privateKey option,
# but this makes the private key world-readable; thus, using privateKeyFile is # # but this makes the private key world-readable; thus, using privateKeyFile is
# recommended. # # recommended.
privateKeyFile = config.sops.secrets.wg-cloonar-key.path; # privateKeyFile = config.sops.secrets.wg-cloonar-key.path;
#
peers = [ # peers = [
{ # {
publicKey = "TKQVDmBnf9av46kQxLQSBDhAeaK8r1zh8zpU64zuc1Q="; # publicKey = "TKQVDmBnf9av46kQxLQSBDhAeaK8r1zh8zpU64zuc1Q=";
allowedIPs = [ "10.42.97.0/20" "10.14.0.0/16" "10.25.0.0/16" ]; # allowedIPs = [ "10.42.97.0/20" "10.14.0.0/16" "10.25.0.0/16" ];
endpoint = "vpn.cloonar.com:51820"; # ToDo: route to endpoint not automatically configured https://wiki.archlinux.org/index.php/WireGuard#Loop_routing https://discourse.nixos.org/t/solved-minimal-firewall-setup-for-wireguard-client/7577 # endpoint = "vpn.cloonar.com:51820"; # ToDo: route to endpoint not automatically configured https://wiki.archlinux.org/index.php/WireGuard#Loop_routing https://discourse.nixos.org/t/solved-minimal-firewall-setup-for-wireguard-client/7577
persistentKeepalive = 25; # persistentKeepalive = 25;
} # }
]; # ];
}; # };
}; # };
# Facial recognition "Windows hello" # Facial recognition "Windows hello"
# services.ir-toggle.enable = true; # services.ir-toggle.enable = true;

4
hosts/nb-01.cloonar.com/pkgs/bento.nix
View File

@@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
name = "bento"; name = "bento";
src = fetchgit { src = fetchgit {
url = "https://github.com/rapenne-s/bento.git"; url = "https://github.com/dpolakovics/bento.git";
rev = "6418bd64ecabbfa720c7a87ec39ee1a8b46a907e"; rev = "54d55f079e485c3be7bc0239806bb64203a911bf";
sha256 = "69b056298cf570debd3718b2e2cb7e63ad9465919c8190cf38043791ce61d0d6"; sha256 = "69b056298cf570debd3718b2e2cb7e63ad9465919c8190cf38043791ce61d0d6";
}; };

6
hosts/nb-01.cloonar.com/pkgs/bento/default.nix
View File

@@ -5,9 +5,9 @@ stdenv.mkDerivation rec {
name = "bento"; name = "bento";
src = fetchgit { src = fetchgit {
url = "https://github.com/rapenne-s/bento.git"; url = "https://github.com/dpolakovics/bento.git";
rev = "6418bd64ecabbfa720c7a87ec39ee1a8b46a907e"; rev = "54d55f079e485c3be7bc0239806bb64203a911bf";
sha256 = "sha256-gLWoZh7fMn3cpIYSJFSVOQHA6qUIJikHXmucHX7P2WI="; sha256 = "sha256-47+MM5uuWhMGKGiWK43lF7ynI392aTgLwCPccHMWlC8=";
}; };
buildInputs = [ ]; buildInputs = [ ];

8
hosts/web-01.cloonar.com/configuration.nix
View File

@@ -32,10 +32,10 @@
./sites/gbv-aktuell.at.nix ./sites/gbv-aktuell.at.nix
./sites/matomo.cloonar.com.nix ./sites/matomo.cloonar.com.nix
./sites/optiprot.eu.nix ./sites/optiprot.eu.nix
./sites/paraclub.at.nix # ./sites/paraclub.at.nix
./sites/api.paraclub.at.nix # ./sites/api.paraclub.at.nix
./sites/tandem.paraclub.at.nix # ./sites/tandem.paraclub.at.nix
./sites/module.paraclub.at.nix # ./sites/module.paraclub.at.nix
./sites/api.optiprot.cloonar.dev.nix ./sites/api.optiprot.cloonar.dev.nix
./sites/cloonar.dev.nix ./sites/cloonar.dev.nix

2
hosts/web-01.cloonar.com/sites/gbv-aktuell.at.nix
View File

@@ -3,7 +3,7 @@
services.typo3.instances."gbv-aktuell.at" = { services.typo3.instances."gbv-aktuell.at" = {
domainAliases = [ "www.gbv-aktuell.at" ]; domainAliases = [ "www.gbv-aktuell.at" ];
authorizedKeys = [ authorizedKeys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDMglRMPCWQv8t67o6U8bU87HF34MPSaXZXAJZPdvtsYqXj8Z2/Xc47DQK98pAPHAFekjG9JK2m97FaV+h9E6uEF0Tg0sjWmqf9ApCNFA5igZgxJvlOTI4AJlQ4PtUY8dBGdiFFEdHf92RLg/FrsROLV5p4GTebpBxxBgQ/gbsZe3Dknfh8LuCUS/awN85j05T36dwp37Z1txly1NpkLsoToqeDBCTrvCZGyyOasVnp2SKPnQID8KgfU2sbzluUJz2lvIYEvfrDaB1jrkhDhhfoIRkJpzyB0Y1p9fuI2P9xKhharxVJ5soiIrvNPSk+Ytld6YhfKGDx/DwIzKiVm18+yGWLy3BOnm2ILugU1hq2H2/qPMa8yShcXp/STXZfdfPxiHfdYjOD4vu1fPNt1qs955vQCR+lO+HBP46QCszrebKvxGo1Qh5nRddU/6DjKrE24aDMbSfQxwiufYklZRFZjhLggs0qE/sMAanhDqfl5cXuFFYoQ8anfHplS40S84E=" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHYyLbVv9l/LhpNhmE3QO0f9Lg8d2Y8JiDdn/cNcmyfO"
]; ];
phpPackage = pkgs.php81; phpPackage = pkgs.php81;
}; };

2
hosts/web-01.cloonar.com/sites/gbv-aktuell.cloonar.dev.nix
View File

@@ -3,7 +3,7 @@
services.typo3.instances."gbv-aktuell.cloonar.dev" = { services.typo3.instances."gbv-aktuell.cloonar.dev" = {
domainAliases = [ "typo3-gbv-aktuell.cloonar.com" ]; domainAliases = [ "typo3-gbv-aktuell.cloonar.com" ];
authorizedKeys = [ authorizedKeys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDMglRMPCWQv8t67o6U8bU87HF34MPSaXZXAJZPdvtsYqXj8Z2/Xc47DQK98pAPHAFekjG9JK2m97FaV+h9E6uEF0Tg0sjWmqf9ApCNFA5igZgxJvlOTI4AJlQ4PtUY8dBGdiFFEdHf92RLg/FrsROLV5p4GTebpBxxBgQ/gbsZe3Dknfh8LuCUS/awN85j05T36dwp37Z1txly1NpkLsoToqeDBCTrvCZGyyOasVnp2SKPnQID8KgfU2sbzluUJz2lvIYEvfrDaB1jrkhDhhfoIRkJpzyB0Y1p9fuI2P9xKhharxVJ5soiIrvNPSk+Ytld6YhfKGDx/DwIzKiVm18+yGWLy3BOnm2ILugU1hq2H2/qPMa8yShcXp/STXZfdfPxiHfdYjOD4vu1fPNt1qs955vQCR+lO+HBP46QCszrebKvxGo1Qh5nRddU/6DjKrE24aDMbSfQxwiufYklZRFZjhLggs0qE/sMAanhDqfl5cXuFFYoQ8anfHplS40S84E=" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAcDedq/yqC2ROzvZGTyR/tDSnTcL3LB32O2QhkgQmfn"
]; ];
phpPackage = pkgs.php81; phpPackage = pkgs.php81;
}; };

6
hosts/web-01.cloonar.com/sites/matomo.cloonar.com.nix
View File

@@ -21,8 +21,8 @@ in {
"catch_workers_output" = true; "catch_workers_output" = true;
"access.log" = "/var/log/$pool.access.log"; "access.log" = "/var/log/$pool.access.log";
}; };
phpPackage = pkgs.php81; phpPackage = pkgs.php83;
phpEnv."PATH" = lib.makeBinPath [ pkgs.php81 ]; phpEnv."PATH" = lib.makeBinPath [ pkgs.php83 ];
}; };
services.nginx.virtualHosts."${domain}" = { services.nginx.virtualHosts."${domain}" = {
@@ -109,7 +109,7 @@ in {
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
User = "${domain}"; User = "${domain}";
ExecStart = "${pkgs.php81}/bin/php /var/www/${domain}/console --matomo-domain=matomo.cloonar.com core:archive"; ExecStart = "${pkgs.php83}/bin/php /var/www/${domain}/console --matomo-domain=matomo.cloonar.com core:archive";
}; };
}; };

2
hosts/web-01.cloonar.com/sites/paraclub.cloonar.dev.nix
View File

@@ -37,7 +37,7 @@ in {
group = "nginx"; group = "nginx";
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDbSqS0TrJnmihjuIwLY74jKmuErF5jarQeVEQbnl7k8DDfVXP6DKybK2wVRIrAMN2VQzgXWWyRj2wNZrvq1whZon6CrEDxDVN/VDGS99pazczbrypmycVnPsevtS3wrEhiQrwCplkPxoZGlSAPGtx3SOzql+iG7xrhJfuPDCgwIboKf8Tir170aflH7ZfXqUX+V5QMbOn+roT8Tj7vUd/za3o3okJQrW3NUHT6/0TDkGsn+lJp30e94GF5RDLUJgM8pBf45WM94dv1uEfRI7+AQJZRta3X2VNSbb8I2dPNLmgxYQaW1VtwGP/RfxoFESdQubN74p+VxNeP7z5AFiZfhEYb0yiAwXiavN7fStXX/MKXxMicS2fdGzieXLWpLol70xx19492kOnlzoiPKJRosNw8N60R+AkbPYdwl5z5uKDn1ve79YaWB3KWS5Pcr9IT1wZAc48UePL6QtcDppHe8tUflPP5h/LCKOmAioWG59YF5pKfYNLSXJzmiudzzrs=" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDbSqS0TrJnmihjuIwLY74jKmuErF5jarQeVEQbnl7k8DDfVXP6DKybK2wVRIrAMN2VQzgXWWyRj2wNZrvq1whZon6CrEDxDVN/VDGS99pazczbrypmycVnPsevtS3wrEhiQrwCplkPxoZGlSAPGtx3SOzql+iG7xrhJfuPDCgwIboKf8Tir170aflH7ZfXqUX+V5QMbOn+roT8Tj7vUd/za3o3okJQrW3NUHT6/0TDkGsn+lJp30e94GF5RDLUJgM8pBf45WM94dv1uEfRI7+AQJZRta3X2VNSbb8I2dPNLmgxYQaW1VtwGP/RfxoFESdQubN74p+VxNeP7z5AFiZfhEYb0yiAwXiavN7fStXX/MKXxMicS2fdGzieXLWpLol70xx19492kOnlzoiPKJRosNw8N60R+AkbPYdwl5z5uKDn1ve79YaWB3KWS5Pcr9IT1wZAc48UePL6QtcDppHe8tUflPP5h/LCKOmAioWG59YF5pKfYNLSXJzmiudzzrs="
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFtMqcJDygWT16b7wF0qaagWUHj1+s6whMq0YRv47WA5" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM6QT0k58R90NrmDIjP1bNalHnwr9Y++tOhV9kRUVivI"
]; ];
}; };
users.groups.${domain} = {}; users.groups.${domain} = {};

2
utils/modules/netdata.nix
View File

@@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
python39 python312
]; ];
services.netdata.configDir."python.d.conf" = pkgs.writeText "python.d.conf" '' services.netdata.configDir."python.d.conf" = pkgs.writeText "python.d.conf" ''

4
utils/pkgs/bento/default.nix
View File

@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
src = fetchgit { src = fetchgit {
url = "https://github.com/dpolakovics/bento.git"; url = "https://github.com/dpolakovics/bento.git";
rev = "e9f254ad25b5d57522a2e45ef6305abb0738ff83"; rev = "54d55f079e485c3be7bc0239806bb64203a911bf";
sha256 = "sha256-VBi3hFelSNXQ4bzSSzhho3EBEBsQuP7/f9TDIwmf+1I="; sha256 = "sha256-47+MM5uuWhMGKGiWK43lF7ynI392aTgLwCPccHMWlC8=";
}; };
buildInputs = [ ]; buildInputs = [ ];