Compare commits
7 commits
f2916b84d8
...
7c65e7ad02
Author | SHA1 | Date | |
---|---|---|---|
Tristan Daniël Maat | 7c65e7ad02 | ||
Tristan Daniël Maat | 4c94932490 | ||
Tristan Daniël Maat | 343c7fcc36 | ||
Tristan Daniël Maat | 5f8899d542 | ||
Tristan Daniël Maat | b8bf3bd3a2 | ||
Tristan Daniël Maat | 458f6c7f7b | ||
Tristan Daniël Maat | 517f4f0080 |
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -54,18 +54,20 @@
|
||||||
recommendedGzipSettings = true;
|
recommendedGzipSettings = true;
|
||||||
recommendedProxySettings = true;
|
recommendedProxySettings = true;
|
||||||
clientMaxBodySize = "10G";
|
clientMaxBodySize = "10G";
|
||||||
|
domain = "tlater.net";
|
||||||
|
|
||||||
virtualHosts = let
|
virtualHosts = let
|
||||||
host = port: extra:
|
host = port: extra:
|
||||||
{
|
lib.recursiveUpdate {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
locations."/" = { proxyPass = "http://localhost:${toString port}"; };
|
locations."/" = { proxyPass = "http://127.0.0.1:${toString port}"; };
|
||||||
} // extra;
|
} extra;
|
||||||
|
domain = config.services.nginx.domain;
|
||||||
in {
|
in {
|
||||||
"tlater.net" = host 3002 { serverAliases = [ "www.tlater.net" ]; };
|
"${domain}" = host 3002 { serverAliases = [ "www.${domain}" ]; };
|
||||||
"gitea.tlater.net" = host 3000 { };
|
"gitea.${domain}" = host 3000 { };
|
||||||
"nextcloud.tlater.net" = host 3001 { };
|
"nextcloud.${domain}" = host 3001 { };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
virtualisation.pods.gitea = {
|
virtualisation.pods.gitea = {
|
||||||
hostname = "gitea.tlater.net";
|
hostname = "gitea.tlater.net";
|
||||||
publish = [ "3000:3000" "2221:2221" ];
|
publish = [ "3000:3000" "2221:2221" ];
|
||||||
|
network = "slirp4netns";
|
||||||
|
|
||||||
containers = {
|
containers = {
|
||||||
gitea = {
|
gitea = {
|
||||||
|
@ -26,7 +27,6 @@
|
||||||
DB_HOST = "gitea-postgres:5432";
|
DB_HOST = "gitea-postgres:5432";
|
||||||
DB_NAME = "gitea";
|
DB_NAME = "gitea";
|
||||||
DB_USER = "gitea";
|
DB_USER = "gitea";
|
||||||
DB_PASSWD = "/qNDDK9WCMuubfA7D8DFwfl9T+Gy2IMDvPhiNpcxZjY=";
|
|
||||||
|
|
||||||
USER_UID = toString config.users.extraUsers.gitea.uid;
|
USER_UID = toString config.users.extraUsers.gitea.uid;
|
||||||
USER_GID = toString config.users.extraGroups.gitea.gid;
|
USER_GID = toString config.users.extraGroups.gitea.gid;
|
||||||
|
@ -47,7 +47,6 @@
|
||||||
environment = {
|
environment = {
|
||||||
POSTGRES_DB = "gitea";
|
POSTGRES_DB = "gitea";
|
||||||
POSTGRES_USER = "gitea";
|
POSTGRES_USER = "gitea";
|
||||||
POSTGRES_PASSWORD = "/qNDDK9WCMuubfA7D8DFwfl9T+Gy2IMDvPhiNpcxZjY=";
|
|
||||||
};
|
};
|
||||||
volumes = [ "gitea-db-data:/var/lib/postgresql/data" ];
|
volumes = [ "gitea-db-data:/var/lib/postgresql/data" ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
minecraft-server-args = [
|
minecraft-server-args = [
|
||||||
|
@ -52,7 +52,7 @@ let
|
||||||
|
|
||||||
in {
|
in {
|
||||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||||
builtins.elem (pkgs.lib.getName pkg) [ "forge-server" ];
|
builtins.elem (lib.getName pkg) [ "forge-server" ];
|
||||||
|
|
||||||
virtualisation.oci-containers.containers.minecraft-voor-kia = let
|
virtualisation.oci-containers.containers.minecraft-voor-kia = let
|
||||||
properties = ./configs/minecraft/voor-kia/server.properties;
|
properties = ./configs/minecraft/voor-kia/server.properties;
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
virtualisation.pods.nextcloud = {
|
virtualisation.pods.nextcloud = {
|
||||||
hostname = "nextcloud.tlater.net";
|
hostname = "nextcloud.tlater.net";
|
||||||
publish = [ "3001:80" ];
|
publish = [ "3001:80" ];
|
||||||
|
network = "slirp4netns";
|
||||||
|
|
||||||
containers = {
|
containers = {
|
||||||
nextcloud = {
|
nextcloud = {
|
||||||
|
@ -18,7 +19,6 @@
|
||||||
POSTGRES_DB = "nextcloud";
|
POSTGRES_DB = "nextcloud";
|
||||||
POSTGRES_USER = "nextcloud";
|
POSTGRES_USER = "nextcloud";
|
||||||
POSTGRES_HOST = "nextcloud-postgres";
|
POSTGRES_HOST = "nextcloud-postgres";
|
||||||
POSTGRES_PASSWORD = "rI7t7Nek1yGA9ucrRc7Uhy0jcjwPjnXa8me4o8tJON8=";
|
|
||||||
OVERWRITEPROTOCOL = "https";
|
OVERWRITEPROTOCOL = "https";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -43,7 +43,6 @@
|
||||||
environment = {
|
environment = {
|
||||||
POSTGRES_DB = "nextcloud";
|
POSTGRES_DB = "nextcloud";
|
||||||
POSTGRES_USER = "nextcloud";
|
POSTGRES_USER = "nextcloud";
|
||||||
POSTGRES_PASSWORD = "rI7t7Nek1yGA9ucrRc7Uhy0jcjwPjnXa8me4o8tJON8=";
|
|
||||||
};
|
};
|
||||||
volumes = [ "nextcloud-db-data:/var/lib/postgresql/data" ];
|
volumes = [ "nextcloud-db-data:/var/lib/postgresql/data" ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -34,6 +34,10 @@
|
||||||
|
|
||||||
ports = [ "3002:3002" ];
|
ports = [ "3002:3002" ];
|
||||||
volumes = [ "tlaternet-mail:/srv/mail" ];
|
volumes = [ "tlaternet-mail:/srv/mail" ];
|
||||||
extraOptions = [ "--hostname=tlater.net" ];
|
extraOptions = [
|
||||||
|
"--hostname=tlater.net"
|
||||||
|
# Rocket 0.4 doesn't support SIGTERM anyway, so SIGKILL is the cleanest exit possible.
|
||||||
|
"--stop-signal=SIGKILL"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,12 +68,16 @@
|
||||||
(import ./modules)
|
(import ./modules)
|
||||||
|
|
||||||
(import ./configuration)
|
(import ./configuration)
|
||||||
({ ... }: {
|
({ lib, ... }: {
|
||||||
users.users.tlater.password = "insecure";
|
users.users.tlater.password = "insecure";
|
||||||
|
|
||||||
# Disable graphical tty so -curses works
|
# Disable graphical tty so -curses works
|
||||||
boot.kernelParams = [ "nomodeset" ];
|
boot.kernelParams = [ "nomodeset" ];
|
||||||
|
|
||||||
|
# Sets the base domain for nginx to localhost so that we
|
||||||
|
# can easily test locally with the VM.
|
||||||
|
services.nginx.domain = lib.mkOverride 99 "localhost";
|
||||||
|
|
||||||
# # Set up VM settings to match real VPS
|
# # Set up VM settings to match real VPS
|
||||||
# virtualisation.memorySize = 3941;
|
# virtualisation.memorySize = 3941;
|
||||||
# virtualisation.cores = 2;
|
# virtualisation.cores = 2;
|
||||||
|
|
|
@ -1,5 +1,12 @@
|
||||||
{ ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ ./virtualisation/pods.nix ./virtualisation/oci-containers.nix ];
|
imports = [ ./virtualisation/pods.nix ./virtualisation/oci-containers.nix ];
|
||||||
|
|
||||||
|
options.services.nginx.domain = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
description = "The base domain name to append to virtual domain names";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue