This commit is contained in:
parent
01b342d140
commit
e31e4cd82e
4 changed files with 5 additions and 51 deletions
|
@ -87,7 +87,7 @@
|
|||
nix repl --file "${./.}/repl.nix" $@
|
||||
'';
|
||||
in {
|
||||
# Make the nixosConfigurations for compat reasons
|
||||
# Make the nixosConfigurations for compat reasons (e.g. vault)
|
||||
nixosConfigurations =
|
||||
(import (inputs.colmena + "/src/nix/hive/eval.nix") {
|
||||
rawFlake = self;
|
||||
|
|
|
@ -1,40 +0,0 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ config, pkgs, ... }:
|
||||
let
|
||||
databases = [ "umami" "drone" ];
|
||||
in
|
||||
{
|
||||
imports = [ ];
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "21.11"; # Did you read the comment?
|
||||
|
||||
# Additional packages
|
||||
environment.systemPackages = with pkgs; [ ];
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ config.services.postgresql.port ];
|
||||
|
||||
services.postgresql =
|
||||
{
|
||||
enable = true;
|
||||
package = pkgs.postgresql_14;
|
||||
ensureDatabases = databases;
|
||||
enableTCPIP = true;
|
||||
# Allow all hosts on the server subnet, should probably lock this down more in the future
|
||||
authentication = "host all all 10.42.42.0/24 trust";
|
||||
ensureUsers = map
|
||||
(name: {
|
||||
inherit name;
|
||||
ensurePermissions = { "DATABASE ${name}" = "ALL PRIVILEGES"; };
|
||||
})
|
||||
databases;
|
||||
};
|
||||
}
|
|
@ -110,10 +110,7 @@
|
|||
ip = "10.42.42.25";
|
||||
mac = "1E:ED:97:2C:C3:9D";
|
||||
};
|
||||
"database" = {
|
||||
ip = "10.42.42.26";
|
||||
mac = "CE:6E:96:87:18:1B";
|
||||
};
|
||||
# 10.42.42.26
|
||||
"bookwyrm" = {
|
||||
ip = "10.42.42.27";
|
||||
mac = "9E:8A:6C:39:27:DE";
|
||||
|
@ -123,11 +120,7 @@
|
|||
ip = "10.42.42.28";
|
||||
mac = "9E:86:D3:46:EE:AE";
|
||||
};
|
||||
"slimmelezer" = {
|
||||
ip = "10.42.42.29";
|
||||
mac = "b4:8a:0a:ee:b0:5e";
|
||||
nix = false;
|
||||
};
|
||||
# 10.42.42.29
|
||||
"vault-1" = {
|
||||
ip = "10.42.42.30";
|
||||
mac = "26:69:0E:7C:B3:79";
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
let
|
||||
inherit (builtins) filter attrValues concatMap mapAttrs;
|
||||
inherit (nixpkgs.lib.attrsets) mapAttrsToList;
|
||||
inherit (nixpkgs.lib) nixosSystem;
|
||||
base_imports = [
|
||||
home-manager.nixosModules.home-manager
|
||||
mailserver.nixosModules.mailserver
|
||||
|
@ -44,7 +45,7 @@ in {
|
|||
mkColmenaHost = { ip ? null, hostname, tags, realm, type ? "lxc", ... }@host:
|
||||
let
|
||||
# this makes local apply work a bit nicer
|
||||
name = if realm == "thalassa" then hostname else "${hostname}.${realm}";
|
||||
name = if type == "local" then hostname else "${hostname}.${realm}";
|
||||
in {
|
||||
"${name}" = {
|
||||
imports = resolve_imports host;
|
||||
|
|
Loading…
Reference in a new issue