Ditch podman and deploy a new version of the website #58

Manually merged
tlater merged 13 commits from tlater/new-website into master 2022-10-14 06:16:48 +01:00
3 changed files with 11 additions and 16 deletions
Showing only changes of commit ab3aa19481 - Show all commits

View file

@ -13,7 +13,6 @@
]; ];
nix = { nix = {
# Enable flakes
package = pkgs.nixFlakes; package = pkgs.nixFlakes;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
@ -31,6 +30,8 @@
secrets.steam = {}; secrets.steam = {};
}; };
# Optimization for minecraft servers, see:
# https://bugs.mojang.com/browse/MC-183518
boot.kernelParams = ["highres=off" "nohz=off"]; boot.kernelParams = ["highres=off" "nohz=off"];
networking = { networking = {
@ -71,7 +72,7 @@
domain = "tlater.net"; domain = "tlater.net";
virtualHosts = let virtualHosts = let
host = port: extra: proxyPassToPort = port: extra:
lib.recursiveUpdate { lib.recursiveUpdate {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
@ -83,9 +84,9 @@
extra; extra;
domain = config.services.nginx.domain; domain = config.services.nginx.domain;
in { in {
"${domain}" = host 3002 {serverAliases = ["www.${domain}"];}; "${domain}" = proxyPassToPort 3002 {serverAliases = ["www.${domain}"];};
"gitea.${domain}" = host 3000 {}; "gitea.${domain}" = proxyPassToPort 3000 {};
"nextcloud.${domain}" = host 3001 {}; "nextcloud.${domain}" = proxyPassToPort 3001 {};
}; };
}; };

View file

@ -1,9 +1,4 @@
{ {
config,
lib,
pkgs,
...
}: {
# Required for the lish console # Required for the lish console
boot.kernelParams = ["console=ttyS0,19200n8"]; boot.kernelParams = ["console=ttyS0,19200n8"];

View file

@ -1,9 +1,8 @@
{lib, ...}: {lib, ...}: let
with lib; { inherit (lib) mkOption types;
imports = [./virtualisation/pods.nix]; in {
options.services.nginx.domain = lib.mkOption {
options.services.nginx.domain = mkOption { type = lib.types.str;
type = types.str;
description = "The base domain name to append to virtual domain names"; description = "The base domain name to append to virtual domain names";
}; };
} }