feat: terraria server && nextcloud raw camera format support
This commit is contained in:
parent
fb06f7eee0
commit
ac770b6531
11 changed files with 186 additions and 53 deletions
|
|
@ -32,6 +32,7 @@
|
|||
domain = "https://bitwarden.net.dn";
|
||||
})
|
||||
(import ../../modules/openldap.nix { })
|
||||
../../modules/terraria.nix
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -23,6 +23,10 @@ let
|
|||
port = 443;
|
||||
ssl = true;
|
||||
}
|
||||
{
|
||||
addr = "0.0.0.0";
|
||||
port = 80;
|
||||
}
|
||||
];
|
||||
}
|
||||
else
|
||||
|
|
@ -77,11 +81,6 @@ let
|
|||
chown nginx:nginx -R /etc/letsencrypt
|
||||
'';
|
||||
|
||||
pre7780 = {
|
||||
hostname = "pre-nextcloud.net.dn";
|
||||
ip = "10.0.0.130";
|
||||
};
|
||||
|
||||
vaultwarden = {
|
||||
domain = "bitwarden.net.dn";
|
||||
};
|
||||
|
|
@ -128,10 +127,30 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
${pre7780.hostname} = mkProxyHost {
|
||||
domain = pre7780.hostname;
|
||||
proxyPass = "http://${pre7780.ip}";
|
||||
ssl = true;
|
||||
"files.net.dn" = {
|
||||
listen = [
|
||||
{
|
||||
addr = "0.0.0.0";
|
||||
port = 80;
|
||||
}
|
||||
];
|
||||
|
||||
root = "/var/www/files";
|
||||
locations."/" = {
|
||||
extraConfig = ''
|
||||
autoindex on;
|
||||
autoindex_exact_size off;
|
||||
autoindex_localtime on;
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = ''
|
||||
types {
|
||||
image/png png;
|
||||
image/jpeg jpg jpeg;
|
||||
image/gif gif;
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
${vaultwarden.domain} = mkProxyHost {
|
||||
|
|
|
|||
|
|
@ -97,6 +97,11 @@ let
|
|||
publicKey = "GAayY6p8ST3I66kFSGY3seaHhfkrc6atcrFu2C9BDDs=";
|
||||
allowedIPs = [ "10.0.0.5/32" ];
|
||||
}
|
||||
{
|
||||
dns = "jonly-mac";
|
||||
publicKey = "jPmeA0WH3vQw/PDNdJwYLfE7Ibl5oZGuta9UkZNEyTk=";
|
||||
allowedIPs = [ "10.0.0.9/32" ];
|
||||
}
|
||||
{
|
||||
# YC
|
||||
dns = "yc";
|
||||
|
|
@ -385,13 +390,14 @@ in
|
|||
@ IN MX 10 mail.${origin}
|
||||
IN TXT "v=spf1 mx"
|
||||
dns IN A ${serverIP}
|
||||
files IN A ${serverIP}
|
||||
nextcloud IN A ${serverIP}
|
||||
bitwarden IN A ${serverIP}
|
||||
pre-nextcloud IN A ${serverIP}
|
||||
ca IN A ${serverIP}
|
||||
${hostname} IN A ${serverIP}
|
||||
mail IN A ${serverIP}
|
||||
api-kube IN A ${kubeIP}
|
||||
vmail IN A 10.0.0.130
|
||||
${dnsRecords}
|
||||
'';
|
||||
};
|
||||
|
|
@ -423,9 +429,10 @@ in
|
|||
${serverIP} IN PTR mail.${personal.domain}.
|
||||
${serverIP} IN PTR ${hostname}.${personal.domain}.
|
||||
${serverIP} IN PTR nextcloud.${personal.domain}.
|
||||
${serverIP} IN PTR files.${personal.domain}.
|
||||
${serverIP} IN PTR bitwarden.${personal.domain}.
|
||||
${serverIP} IN PTR pre-nextcloud.${personal.domain}.
|
||||
${serverIP} IN PTR ca.${personal.domain}.
|
||||
130 IN PTR vmail.${personal.domain}.
|
||||
${dnsReversedRecords}
|
||||
'';
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue