mirror of
https://gitlab.com/upRootNutrition/dotfiles.git
synced 2025-12-07 13:32:15 -06:00
fix: miniserve removed
This commit is contained in:
parent
3790698e42
commit
ccd625105c
1 changed files with 18 additions and 33 deletions
|
|
@ -16,43 +16,34 @@ in
|
||||||
autostart = true;
|
autostart = true;
|
||||||
config = {
|
config = {
|
||||||
system.stateVersion = "25.05";
|
system.stateVersion = "25.05";
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
22
|
22
|
||||||
8080
|
80
|
||||||
];
|
];
|
||||||
|
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.PasswordAuthentication = false;
|
settings.PasswordAuthentication = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.etc."website".source = websitePkg;
|
environment.etc."website".source = websitePkg;
|
||||||
|
|
||||||
users.users.root.openssh.authorizedKeys.keys = flake.config.people.users.${user0}.sshKeys;
|
users.users.root.openssh.authorizedKeys.keys = flake.config.people.users.${user0}.sshKeys;
|
||||||
|
systemd.network = {
|
||||||
systemd = {
|
enable = true;
|
||||||
network = {
|
networks."10-enp" = {
|
||||||
enable = true;
|
matchConfig.Name = "enp0s3";
|
||||||
networks."10-enp" = {
|
addresses = [
|
||||||
matchConfig.Name = "enp0s3";
|
{ Address = "${serviceCfg.interface.ip}/24"; }
|
||||||
addresses = [
|
];
|
||||||
{ Address = "${serviceCfg.interface.ip}/24"; }
|
gateway = [ serviceCfg.interface.gate ];
|
||||||
];
|
|
||||||
gateway = [ serviceCfg.interface.gate ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.website = {
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
after = [ "network.target" ];
|
|
||||||
serviceConfig = {
|
|
||||||
ExecStart = "${pkgs.miniserve}/bin/miniserve /etc/website --index index.html -p 8080";
|
|
||||||
Restart = "always";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
services.caddy = {
|
||||||
|
enable = true;
|
||||||
|
virtualHosts.":80".extraConfig = ''
|
||||||
|
root * /etc/website
|
||||||
|
file_server
|
||||||
|
try_files {path} /index.html
|
||||||
|
'';
|
||||||
|
};
|
||||||
microvm = {
|
microvm = {
|
||||||
vcpu = 2;
|
vcpu = 2;
|
||||||
mem = 3072;
|
mem = 3072;
|
||||||
|
|
@ -75,23 +66,17 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.caddy = {
|
services.caddy = {
|
||||||
enable = true;
|
|
||||||
virtualHosts.${host}.extraConfig = ''
|
virtualHosts.${host}.extraConfig = ''
|
||||||
reverse_proxy ${serviceCfg.interface.ip}:8080
|
reverse_proxy ${serviceCfg.interface.ip}:80
|
||||||
|
|
||||||
tls ${serviceCfg.ssl.cert} ${serviceCfg.ssl.key}
|
tls ${serviceCfg.ssl.cert} ${serviceCfg.ssl.key}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
security.acme.certs.${host} = {
|
security.acme.certs.${host} = {
|
||||||
dnsProvider = instances.web.dns.provider0;
|
dnsProvider = instances.web.dns.provider0;
|
||||||
environmentFile = config.sops.secrets."dns/${instances.web.dns.provider0}".path;
|
environmentFile = config.sops.secrets."dns/${instances.web.dns.provider0}".path;
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"d ${serviceCfg.mntPaths.path0} 0755 microvm wheel - -"
|
"d ${serviceCfg.mntPaths.path0} 0755 microvm wheel - -"
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue