1
1
Fork 0

Compare commits

..

No commits in common. "d1bd4911412cf1570ce7b395616250375cbb2779" and "1a3b50e11d9a8a769d9e4f071ed13a1a16c4bdc0" have entirely different histories.

2 changed files with 33 additions and 31 deletions

View File

@ -6,22 +6,20 @@
}; };
outputs = { self, nixpkgs, nixos-wsl }: { outputs = { self, nixpkgs, nixos-wsl }: {
nixosConfigurations = { nixosConfigurations.catacomb = nixpkgs.lib.nixosSystem {
catacomb = nixpkgs.lib.nixosSystem { system = "aarch64-linux";
system = "aarch64-linux"; modules = [ ./machine/catacomb ];
modules = [ ./machine/catacomb ]; };
}; nixosConfigurations.empyrean = nixpkgs.lib.nixosSystem {
empyrean = nixpkgs.lib.nixosSystem { system = "x86_64-linux";
system = "x86_64-linux"; modules = [ ./machine/empyrean ];
modules = [ ./machine/empyrean ]; };
}; nixosConfigurations.stagirite = nixpkgs.lib.nixosSystem {
stagirite = nixpkgs.lib.nixosSystem { system = "x86_64-linux";
system = "x86_64-linux"; modules = [
modules = [ nixos-wsl.nixosModules.wsl
nixos-wsl.nixosModules.wsl ./machine/stagirite
./machine/stagirite ];
];
};
}; };
}; };
} }

View File

@ -64,25 +64,29 @@
]; ];
environment.variables.EDITOR = "vim"; environment.variables.EDITOR = "vim";
services.nginx = let services.nginx = {
static-site = srv-dir: {
enableACME = true;
forceSSL = true;
root = "/srv/${srv-dir}/";
extraConfig = ''
access_log /var/log/nginx/access_${srv-dir}.log;
index index.html;
'';
};
in {
enable = true; enable = true;
recommendedProxySettings = true; recommendedProxySettings = true;
virtualHosts = { virtualHosts = {
# Static pages # Static pages
"wedding.ktvb.site" = static-site "wedding.ktvb.site"; "www.ktvb.site" = {
"www.ktvb.site" = static-site "www.ktvb.site"; enableACME = true;
"mirror.alogoulogoi.com" = static-site "mirror.alogoulogoi.com"; forceSSL = true;
"www.alogoulogoi.com" = static-site "www"; root = "/srv/wedding/";
extraConfig = ''
access_log /var/log/nginx/access.ktvb.log;
index index.html;
'';
};
"www.alogoulogoi.com" = {
enableACME = true;
forceSSL = true;
root = "/srv/www/";
extraConfig = ''
access_log /var/log/nginx/access.www.log;
index index.html;
'';
};
# Deny all other subdomains # Deny all other subdomains
"alogoulogoi.com" = { "alogoulogoi.com" = {
default = true; default = true;