cleanup
This commit is contained in:
parent
3e804e48d0
commit
8962c1072e
17 changed files with 8 additions and 39 deletions
|
@ -1,7 +1,6 @@
|
||||||
{ cluster, config, hosts, inputs, lib, pkgs, tools, ... }:
|
{ cluster, config, hosts, inputs, lib, pkgs, tools, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (hosts.${config.networking.hostName}) interfaces;
|
|
||||||
inherit (tools.meta) domain;
|
inherit (tools.meta) domain;
|
||||||
inherit (config.links) pdnsAdmin;
|
inherit (config.links) pdnsAdmin;
|
||||||
inherit (cluster.config) vars;
|
inherit (cluster.config) vars;
|
||||||
|
|
|
@ -2,10 +2,8 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (hosts.${config.networking.hostName}) interfaces;
|
inherit (hosts.${config.networking.hostName}) interfaces;
|
||||||
inherit (cluster.config) vars;
|
|
||||||
|
|
||||||
patroni = cluster.config.links.patroni-pg-access;
|
patroni = cluster.config.links.patroni-pg-access;
|
||||||
pdns-api = cluster.config.links.powerdns-api;
|
|
||||||
|
|
||||||
translateConfig = cfg: let
|
translateConfig = cfg: let
|
||||||
configList = lib.mapAttrsToList (n: v: "${n}=${v}") cfg;
|
configList = lib.mapAttrsToList (n: v: "${n}=${v}") cfg;
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
{ config, lib, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (config.vars) hosts;
|
|
||||||
|
|
||||||
cfg = config.services.patroni;
|
cfg = config.services.patroni;
|
||||||
|
|
||||||
renameToLink = mode: n: v: lib.nameValuePair "patroni-etcd-node-${mode}-${n}" v;
|
renameToLink = mode: n: v: lib.nameValuePair "patroni-etcd-node-${mode}-${n}" v;
|
||||||
|
|
|
@ -10,8 +10,6 @@ let
|
||||||
pg = pkgs.postgresql_14;
|
pg = pkgs.postgresql_14;
|
||||||
|
|
||||||
baseDir = "/srv/storage/database/postgres-ha";
|
baseDir = "/srv/storage/database/postgres-ha";
|
||||||
|
|
||||||
cfg = config.services.patroni;
|
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
{ config, ... }:
|
{ config, ... }:
|
||||||
|
|
||||||
let
|
|
||||||
inherit (config.vars) hosts;
|
|
||||||
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
services.websites = {
|
services.websites = {
|
||||||
nodes = {
|
nodes = {
|
||||||
|
|
|
@ -10,8 +10,6 @@
|
||||||
let
|
let
|
||||||
systems = [ "x86_64-linux" "aarch64-linux" ];
|
systems = [ "x86_64-linux" "aarch64-linux" ];
|
||||||
|
|
||||||
forSystems = nixpkgs.lib.genAttrs systems;
|
|
||||||
|
|
||||||
nixpkgsFor = nixpkgs.legacyPackages;
|
nixpkgsFor = nixpkgs.legacyPackages;
|
||||||
|
|
||||||
inherit (nixpkgs) lib;
|
inherit (nixpkgs) lib;
|
||||||
|
|
|
@ -1,11 +1,8 @@
|
||||||
{ lib, config, tools, ... }:
|
{ lib, config, tools, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (tools.meta) domain adminEmail;
|
inherit (tools.meta) adminEmail;
|
||||||
in
|
in {
|
||||||
with tools.nginx.vhosts;
|
|
||||||
with tools.nginx.mappers;
|
|
||||||
{
|
|
||||||
security.acme.defaults.email = adminEmail;
|
security.acme.defaults.email = adminEmail;
|
||||||
security.acme.acceptTerms = true;
|
security.acme.acceptTerms = true;
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
|
|
|
@ -30,11 +30,8 @@ in
|
||||||
origin = domain;
|
origin = domain;
|
||||||
recipientDelimiter = "+";
|
recipientDelimiter = "+";
|
||||||
|
|
||||||
# TODO: replace with proper certs
|
sslCert = "${certDir}/fullchain.pem";
|
||||||
sslCert = "/var/lib/acme/mail.${domain}/fullchain.pem";
|
sslKey = "${certDir}/key.pem";
|
||||||
sslKey = "/var/lib/acme/mail.${domain}/key.pem";
|
|
||||||
#sslCert = "${certDir}/fullchain.pem";
|
|
||||||
#sslKey = "${certDir}/privkey.pem";
|
|
||||||
|
|
||||||
setSendmail = true;
|
setSendmail = true;
|
||||||
|
|
||||||
|
|
|
@ -26,8 +26,6 @@ let
|
||||||
);
|
);
|
||||||
|
|
||||||
login = x: "https://login.${domain}/auth/realms/master/protocol/openid-connect/${x}";
|
login = x: "https://login.${domain}/auth/realms/master/protocol/openid-connect/${x}";
|
||||||
|
|
||||||
myNode = hosts.${config.networking.hostName};
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
{ cluster, config, lib, pkgs, tools, ... }:
|
{ cluster, config, lib, pkgs, tools, ... }:
|
||||||
let
|
let
|
||||||
cfg = config.services.nextcloud.config;
|
|
||||||
|
|
||||||
patroni = cluster.config.links.patroni-pg-access;
|
patroni = cluster.config.links.patroni-pg-access;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
with tools.nginx;
|
with tools.nginx;
|
||||||
let
|
let
|
||||||
login = "login.${tools.meta.domain}";
|
login = "login.${tools.meta.domain}";
|
||||||
cfg = config.services.keycloak;
|
|
||||||
kc = config.links.keycloak;
|
kc = config.links.keycloak;
|
||||||
patroni = cluster.config.links.patroni-pg-access;
|
patroni = cluster.config.links.patroni-pg-access;
|
||||||
in
|
in
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
{ tools, ... }:
|
{ tools, ... }:
|
||||||
with tools.vhosts;
|
with tools.vhosts;
|
||||||
let
|
let
|
||||||
inherit (tools) domain;
|
|
||||||
|
|
||||||
noSSL = { enableACME = false; forceSSL = false; };
|
noSSL = { enableACME = false; forceSSL = false; };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,11 +1,8 @@
|
||||||
{ lib, config, tools, ... }:
|
{ lib, config, tools, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (tools.meta) domain adminEmail;
|
inherit (tools.meta) adminEmail;
|
||||||
in
|
in {
|
||||||
with tools.nginx.vhosts;
|
|
||||||
with tools.nginx.mappers;
|
|
||||||
{
|
|
||||||
security.acme.defaults.email = adminEmail;
|
security.acme.defaults.email = adminEmail;
|
||||||
security.acme.acceptTerms = true;
|
security.acme.acceptTerms = true;
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
|
|
|
@ -20,7 +20,6 @@ let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
privateKeyFile = config.age.secrets.hyprspace-key.path;
|
privateKeyFile = config.age.secrets.hyprspace-key.path;
|
||||||
discoverKey = config.age.secrets.hyprspace-discover-key.path;
|
|
||||||
runConfig = "/run/hyprspace.yml";
|
runConfig = "/run/hyprspace.yml";
|
||||||
in {
|
in {
|
||||||
networking.hosts = lib.mapAttrs' (k: v: lib.nameValuePair v.hypr.addr [k "${k}.hypr"]) hyprspaceCapableNodes;
|
networking.hosts = lib.mapAttrs' (k: v: lib.nameValuePair v.hypr.addr [k "${k}.hypr"]) hyprspaceCapableNodes;
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
{
|
{
|
||||||
perSystem = { filters, inputs', pkgs, self', system, ... }:
|
perSystem = { filters, inputs', pkgs, self', system, ... }:
|
||||||
let
|
let
|
||||||
inherit (pkgs) lib;
|
|
||||||
inherit (self'.packages) nix-super;
|
inherit (self'.packages) nix-super;
|
||||||
|
|
||||||
pins = import ./sources;
|
pins = import ./sources;
|
||||||
|
|
|
@ -29,6 +29,6 @@ buildGoModule rec {
|
||||||
description = "A Simple IPFS Pinning Service";
|
description = "A Simple IPFS Pinning Service";
|
||||||
homepage = "https://github.com/DeedleFake/sips";
|
homepage = "https://github.com/DeedleFake/sips";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
with python3Packages;
|
with python3Packages;
|
||||||
|
|
||||||
toPythonModule (buildPythonApplication rec {
|
toPythonModule (buildPythonApplication {
|
||||||
pname = "searxng";
|
pname = "searxng";
|
||||||
version = "1.0.0pre_${builtins.substring 0 7 pins.searxng.revision}";
|
version = "1.0.0pre_${builtins.substring 0 7 pins.searxng.revision}";
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue