extract some varaibles
This commit is contained in:
@@ -1,4 +1,8 @@
|
||||
{
|
||||
{ config, pkgs, inputs, vars, ... }:
|
||||
let
|
||||
ip = vars.ipv4;
|
||||
in
|
||||
{
|
||||
networking.firewall.allowedTCPPorts = [ 53 ];
|
||||
networking.firewall.allowedUDPPorts = [ 53 ];
|
||||
|
||||
@@ -12,7 +16,7 @@
|
||||
}
|
||||
];
|
||||
dns = {
|
||||
bind_hosts = [ "127.0.0.1" "192.168.0.6" ]; # "192.168.2.1" ];
|
||||
bind_hosts = [ "127.0.0.1" "${ip}" ]; # "192.168.2.1" ];
|
||||
port = 53;
|
||||
protection_enabled = true;
|
||||
filtering_enabled = true;
|
||||
@@ -26,33 +30,33 @@
|
||||
rewrites = [
|
||||
{
|
||||
"domain" = "kopatz.ddns.net";
|
||||
"answer" = "192.168.0.6";
|
||||
"answer" = ip;
|
||||
}
|
||||
{
|
||||
"domain" = "server.home";
|
||||
"answer" = "192.168.0.6";
|
||||
"answer" = ip;
|
||||
}
|
||||
{
|
||||
"domain" = "server.local";
|
||||
"answer" = "192.168.0.6";
|
||||
"answer" = ip;
|
||||
}
|
||||
{
|
||||
{
|
||||
"domain" = "adguard.local";
|
||||
"answer" = "192.168.0.6";
|
||||
"answer" = ip;
|
||||
}
|
||||
{
|
||||
"domain" = "nextcloud.local";
|
||||
"answer" = ip;
|
||||
}
|
||||
{
|
||||
"domain" = "turnserver.local";
|
||||
"answer" = "192.168.2.1";
|
||||
}
|
||||
{
|
||||
"domain" = "nextcloud.local";
|
||||
"answer" = "192.168.0.6";
|
||||
}
|
||||
{
|
||||
"domain" = "turnserver.local";
|
||||
"answer" = "192.168.2.1";
|
||||
}
|
||||
{
|
||||
"domain" = "inverter.local";
|
||||
"answer" = "192.168.0.9";
|
||||
}
|
||||
];
|
||||
];
|
||||
};
|
||||
querylog = {
|
||||
enabled = false;
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
{ vars, ... }:
|
||||
let
|
||||
ip = vars.ipv4;
|
||||
wireguardIp = vars.wireguardIp;
|
||||
in
|
||||
{
|
||||
networking.firewall.allowedTCPPorts = [ 19999 ];
|
||||
services.netdata = {
|
||||
@@ -8,7 +13,7 @@
|
||||
|
||||
[web]
|
||||
default port = 19999
|
||||
bind to = 192.168.0.6 192.168.2.1
|
||||
bind to = ${ip} ${wireguardIp}
|
||||
allow connections from = localhost 192.168.0.* 192.168.2.*
|
||||
|
||||
[db]
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{ config, pkgs, lib, inputs, ... }:
|
||||
{ config, pkgs, lib, inputs, vars, ... }:
|
||||
let
|
||||
wireguardIp = vars.wireguardIp;
|
||||
in
|
||||
{
|
||||
age.secrets.nextcloud-cert = {
|
||||
file = ../secrets/nextcloud-cert.age;
|
||||
@@ -26,15 +29,15 @@
|
||||
# Setup Nextcloud virtual host to listen on ports
|
||||
virtualHosts = {
|
||||
"nextcloud.local" = {
|
||||
serverAliases = [ "192.168.2.1" ];
|
||||
serverAliases = [ wireguardIp ];
|
||||
## Force HTTP redirect to HTTPS
|
||||
forceSSL = true;
|
||||
locations."~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[s]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)".extraConfig = ''
|
||||
client_max_body_size 5G;
|
||||
'';
|
||||
#sslTrustedCertificate = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
sslCertificate = config.age.secrets.nextcloud-cert.path;
|
||||
sslCertificateKey = config.age.secrets.nextcloud-key.path;
|
||||
locations."~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[s]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)".extraConfig = ''
|
||||
client_max_body_size 5G;
|
||||
'';
|
||||
#sslTrustedCertificate = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
sslCertificate = config.age.secrets.nextcloud-cert.path;
|
||||
sslCertificateKey = config.age.secrets.nextcloud-key.path;
|
||||
## LetsEncrypt
|
||||
#enableACME = true;
|
||||
};
|
||||
@@ -49,26 +52,25 @@
|
||||
services.nextcloud = {
|
||||
enable = true;
|
||||
package = pkgs.nextcloud27;
|
||||
https = true;
|
||||
https = true;
|
||||
hostName = "nextcloud.local";
|
||||
config.adminpassFile = config.age.secrets.nextcloud-admin.path;
|
||||
config.dbtype = "pgsql";
|
||||
database.createLocally = true;
|
||||
config.extraTrustedDomains = [ "192.168.2.1" ];
|
||||
config.dbtype = "pgsql";
|
||||
database.createLocally = true;
|
||||
config.extraTrustedDomains = [ wireguardIp ];
|
||||
home = "/mnt/250ssd/nextcloud";
|
||||
|
||||
extraApps = with config.services.nextcloud.package.packages.apps; {
|
||||
inherit keeweb onlyoffice calendar mail;
|
||||
inherit keeweb onlyoffice calendar mail;
|
||||
spreed = pkgs.fetchNextcloudApp rec {
|
||||
url = "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.1/spreed-v17.1.1.tar.gz";
|
||||
sha256 = "sha256-LaUG0maatc2YtWQjff7J54vadQ2RE4X6FcW8vFefBh8=";
|
||||
};
|
||||
};
|
||||
|
||||
phpOptions = {
|
||||
upload_max_filesize = "5G";
|
||||
post_max_size = "5G";
|
||||
};
|
||||
phpOptions = {
|
||||
upload_max_filesize = "5G";
|
||||
post_max_size = "5G";
|
||||
};
|
||||
extraAppsEnable = true;
|
||||
extraOptions.enabledPreviewProviders = [
|
||||
"OC\\Preview\\BMP"
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{ config, pkgs, lib, inputs, ... }:
|
||||
{ config, pkgs, lib, inputs, vars, ... }:
|
||||
let
|
||||
ip = vars.ipv4;
|
||||
wireguardIp = vars.wireguardIp;
|
||||
in
|
||||
{
|
||||
networking.firewall.allowedTCPPorts = [ 28981 ];
|
||||
age.secrets.paperless = {
|
||||
@@ -10,7 +14,7 @@
|
||||
enable = true;
|
||||
port = 28981;
|
||||
passwordFile = config.age.secrets.paperless.path;
|
||||
address = "192.168.2.1";
|
||||
address = wireguardIp;
|
||||
mediaDir = "/mnt/250ssd/paperless";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
{
|
||||
networking = {
|
||||
defaultGateway = "192.168.0.1";
|
||||
useDHCP = false;
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedUDPPorts = [ 5000 ];
|
||||
};
|
||||
nameservers = [
|
||||
"127.0.0.1"
|
||||
"1.1.1.1"
|
||||
];
|
||||
interfaces = {
|
||||
"enp0s31f6" = {
|
||||
name = "eth0";
|
||||
ipv4.addresses = [{
|
||||
address = "192.168.0.6";
|
||||
prefixLength = 24;
|
||||
}];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,7 @@
|
||||
{ config, pkgs, lib, inputs, ... }:
|
||||
{ config, pkgs, lib, inputs, vars, ... }:
|
||||
let
|
||||
wireguardIp = vars.wireguardIp;
|
||||
in
|
||||
{
|
||||
|
||||
age.secrets.wireguard-private = {
|
||||
@@ -15,70 +18,70 @@
|
||||
autostart = true;
|
||||
listenPort = 51820;
|
||||
address = [
|
||||
"192.168.2.1/24"
|
||||
"${wireguardIp}/24"
|
||||
];
|
||||
peers = [
|
||||
{
|
||||
allowedIPs = [
|
||||
"192.168.2.2/32"
|
||||
];
|
||||
persistentKeepalive = 25;
|
||||
persistentKeepalive = 25;
|
||||
publicKey = "dUBPIEnAiHIZCMjqV0ya8qotN3UnMhlEVyGNQcR3gVI=";
|
||||
}
|
||||
{
|
||||
allowedIPs = [
|
||||
"192.168.2.3/32"
|
||||
];
|
||||
persistentKeepalive = 25;
|
||||
persistentKeepalive = 25;
|
||||
publicKey = "Eg5ZS3zN05mJ/gct6wJlwVAHTlXpkhxFfUd7yscANV0=";
|
||||
}
|
||||
{
|
||||
{
|
||||
allowedIPs = [
|
||||
"192.168.2.4/32"
|
||||
];
|
||||
persistentKeepalive = 25;
|
||||
persistentKeepalive = 25;
|
||||
publicKey = "8Eigfs+k2k2WPaMn+SqDmlSHdMv+I+xcBr/2qhtpGzI=";
|
||||
}
|
||||
{
|
||||
{
|
||||
allowedIPs = [
|
||||
"192.168.2.20/32"
|
||||
];
|
||||
persistentKeepalive = 25;
|
||||
persistentKeepalive = 25;
|
||||
publicKey = "25u1RSfjsx3wb1DMeTm0pvUfUkG7zTjGaN+m0w6ZjCw=";
|
||||
}
|
||||
{
|
||||
{
|
||||
allowedIPs = [
|
||||
"192.168.2.21/32"
|
||||
];
|
||||
persistentKeepalive = 25;
|
||||
persistentKeepalive = 25;
|
||||
publicKey = "S+8F+yxSQvjjoU44LRYqRv1YulqmOKumUtYo/YIh7X8=";
|
||||
}
|
||||
{
|
||||
{
|
||||
allowedIPs = [
|
||||
"192.168.2.22/32"
|
||||
];
|
||||
persistentKeepalive = 25;
|
||||
persistentKeepalive = 25;
|
||||
publicKey = "/dIW7K49vB9HOghFeXvcY7wu2utQltuv6RfgCbxZwlk=";
|
||||
}
|
||||
{
|
||||
{
|
||||
allowedIPs = [
|
||||
"192.168.2.23/32"
|
||||
];
|
||||
persistentKeepalive = 25;
|
||||
persistentKeepalive = 25;
|
||||
publicKey = "89rjQXNcyCRUCihqfqcOnctWmhiNR8snpRFF6dyHAmk=";
|
||||
}
|
||||
{
|
||||
{
|
||||
allowedIPs = [
|
||||
"192.168.2.24/32"
|
||||
];
|
||||
persistentKeepalive = 25;
|
||||
persistentKeepalive = 25;
|
||||
publicKey = "adaWtboVz3UhpNBKFirs7slbU2+Y3GaV5yS2EoafwVU=";
|
||||
}
|
||||
{
|
||||
{
|
||||
allowedIPs = [
|
||||
"192.168.2.5/32"
|
||||
];
|
||||
persistentKeepalive = 25;
|
||||
persistentKeepalive = 25;
|
||||
publicKey = "g5uTlA1IciXgtSbECjhVis0dajRAc53Oa7Hz6dUI+0Q=";
|
||||
}
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user