1
1
Fork 0

Compare commits

..

3 Commits

2 changed files with 31 additions and 33 deletions

View File

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

View File

@ -64,29 +64,25 @@
]; ];
environment.variables.EDITOR = "vim"; environment.variables.EDITOR = "vim";
services.nginx = { services.nginx = let
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
"www.ktvb.site" = { "wedding.ktvb.site" = static-site "wedding.ktvb.site";
enableACME = true; "www.ktvb.site" = static-site "www.ktvb.site";
forceSSL = true; "mirror.alogoulogoi.com" = static-site "mirror.alogoulogoi.com";
root = "/srv/wedding/"; "www.alogoulogoi.com" = static-site "www";
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;