hosts/prefect-vps: move to hosts/prefect

This commit is contained in:
Mr Hedgehog 2022-07-11 18:02:50 -04:00
parent 61fad5a464
commit dfd66c3956
No known key found for this signature in database
12 changed files with 22 additions and 202 deletions

View file

@ -117,14 +117,6 @@
];
specialArgs = {inherit self inputs;};
};
nixosConfigurations.prefect-vps = lib.nixosSystem {
system = "x86_64-linux";
modules = [
./hosts/prefect-vps/configuration.nix
./hosts/prefect-vps/bootloader.nix
];
specialArgs = {inherit self inputs;};
};
nixosConfigurations.zaphod = lib.nixosSystem {
system = "x86_64-linux";
modules = [

View file

@ -1,17 +0,0 @@
{
pkgs,
lib,
modulesPath,
...
}: {
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot = {
cleanTmpDir = true;
loader = {
grub.device = "/dev/sda";
};
initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" ];
initrd.kernelModules = [ "nvme" ];
kernelPackages = pkgs.linuxPackages_latest;
};
}

View file

@ -1,28 +0,0 @@
{ pkgs, lib, inputs, ... }: {
imports = [
# Common Config
../common/packages.nix
../common/nixConfig.nix
../common/nixpkgsConfig.nix
../common/root.nix
../common/ssh.nix
# My user, also a default.
../../users/thehedgehog/default.nix
# Machine-specific configurations.
./firewall.nix
./networking.nix
./hardware.nix
# Running Services
./services/caddy.nix
./services/tailscale.nix
];
fileSystems = {
"/" = {
fsType = "ext4";
device = "scsi-0QEMU_QEMU_HARDDISK_21170924-part1";
};
};
}

View file

@ -1,3 +0,0 @@
{
networking.firewall.allowedTCPPorts = [80 443];
}

View file

@ -1,15 +0,0 @@
{ lib, ...}: {
networking = {
hostName = "prefect-vps";
interfaces.enp1s0 = {
ipv6.addresses = [{
address = "2a01:4ff:f0:98bf::";
prefixLength = 64;
}];
};
defaultGateway6 = {
address = "fe80::1";
interface = "enp1s0";
};
};
}

View file

@ -1,74 +0,0 @@
{
lib,
pkgs,
config,
...
}: {
services.caddy = {
enable = true;
# package = pkgs.callPackage ../../../pkgs/caddy.nix {
# plugins = [
# "github.com/greenpau/caddy-security"
# ];
# vendorSha256 = "sha256-W1/6D5KvKFzS26+6bCik0frPsXlVZ/XlyHE5FGu1uEc=";
# };
email = "hedgehog@mrhedgehog.xyz";
# globalConfig = ''
# '';
virtualHosts = {
"reddit.thehedgehog.me" = {
extraConfig = ''
reverse_proxy http://marvin:4000
'';
};
"adguard.thehedgehog.me" = {
extraConfig = ''
reverse_proxy http://marvin:2500
'';
};
"rss.thehedgehog.me" = {
extraConfig = ''
reverse_proxy http://marvin:6000
'';
};
"media.thehedgehog.me" = {
serverAliases = [ "jellyfin.thehedgehog.me" ];
extraConfig = ''
reverse_proxy http://marvin:8096
'';
};
"hydra.thehedgehog.me" = {
extraConfig = ''
reverse_proxy http://marvin:3000
'';
};
"dav.thehedgehog.me" = {
extraConfig = ''
reverse_proxy http://marvin:5352
'';
};
"rss-bridge.thehedgehog.me" = {
extraConfig = ''
reverse_proxy http://marvin:80
'';
};
"git.thehedgehog.me" = {
extraConfig = ''
reverse_proxy http://marvin:3001
'';
};
"bw.thehedgehog.me" = {
extraConfig = ''
reverse_proxy http://marvin:8000
'';
};
"dash.thehedgehog.me" = {
extraConfig = ''
reverse_proxy http://marvin:3003
'';
};
};
extraConfig = ''
'';
};
}

View file

@ -1,8 +0,0 @@
{config, ...}: {
services.tailscale = {
enable = true;
};
networking.firewall.trustedInterfaces = [ "tailscale0"];
networking.firewall.allowedUDPPorts = [ config.services.tailscale.port ];
networking.firewall.checkReversePath = "loose";
}

View file

@ -1,29 +1,17 @@
{
pkgs,
lib,
modulesPath,
...
}: {
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot = {
cleanTmpDir = true;
loader = {
efi.canTouchEfiVariables = false;
grub.enable = true;
grub.devices = [
"/dev/disk/by-id/wwn-0x5000c50080db8af8"
"/dev/disk/by-id/wwn-0x5000c50080dd8d8f"
];
grub.efiSupport = false;
grub.configurationLimit = 5;
# grub.mirroredBoots = [
# {
# devices = [
# /dev/sda1
# /dev/sdb1
# ];
# path = "/boot";
# }
# ];
grub.device = "/dev/sda";
};
initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" ];
initrd.kernelModules = [ "nvme" ];
kernelPackages = pkgs.linuxPackages_latest;
supportedFilesystems = lib.mkForce ["btrfs" "vfat" "f2fs"];
};
}

View file

@ -13,6 +13,7 @@
# Machine-specific configurations.
./firewall.nix
./networking.nix
./hardware.nix
# Running Services
./services/caddy.nix
@ -20,8 +21,8 @@
];
fileSystems = {
"/" = {
fsType = "btrfs";
device = "/dev/disk/by-id/wwn-0x5000c50080db8af8-part2";
fsType = "ext4";
device = "scsi-0QEMU_QEMU_HARDDISK_21170924-part1";
};
};
}

View file

@ -1,31 +1,15 @@
{ lib, ...}: let
external-mac = "00:11:22:33:44:55";
ext-if = "enp0s31f6";
external-ip = "136.243.175.187";
external-gw = "136.243.175.129";
external-ip6 = "2a01:4f8:171:24ae::";
external-gw6 = "fe80::1";
external-netmask = 26;
external-netmask6 = 64;
in {
{ lib, ...}: {
networking = {
hostName = "prefect";
enableIPv6 = true;
interfaces."${ext-if}" = {
ipv4.addresses = [{
address = external-ip;
prefixLength = external-netmask;
}];
hostName = "prefect-vps";
interfaces.enp1s0 = {
ipv6.addresses = [{
address = external-ip6;
prefixLength = external-netmask6;
address = "2a01:4ff:f0:98bf::";
prefixLength = 64;
}];
};
defaultGateway6 = {
address = external-gw6;
interface = ext-if;
address = "fe80::1";
interface = "enp1s0";
};
defaultGateway = external-gw;
};
services.udev.extraRules = ''SUBSYSTEM=="net", ATTR{address}=="${external-mac}", NAME="${ext-if}"'';
}

View file

@ -6,12 +6,12 @@
}: {
services.caddy = {
enable = true;
package = pkgs.callPackage ../../../pkgs/caddy.nix {
plugins = [
"github.com/greenpau/caddy-security"
];
vendorSha256 = "sha256-W1/6D5KvKFzS26+6bCik0frPsXlVZ/XlyHE5FGu1uEc=";
};
# package = pkgs.callPackage ../../../pkgs/caddy.nix {
# plugins = [
# "github.com/greenpau/caddy-security"
# ];
# vendorSha256 = "sha256-W1/6D5KvKFzS26+6bCik0frPsXlVZ/XlyHE5FGu1uEc=";
# };
email = "hedgehog@mrhedgehog.xyz";
# globalConfig = ''
# '';