Add sops defaults
This commit is contained in:
parent
6b9c9dba92
commit
8cec9745da
27 changed files with 75 additions and 144 deletions
|
|
@ -91,9 +91,6 @@
|
|||
};
|
||||
|
||||
|
||||
sops.secrets.pap-secrets = {
|
||||
sopsFile = ./secrets.yaml;
|
||||
};
|
||||
environment.etc."ppp/pap-secrets".source = config.sops.secrets.pap-secrets.path;
|
||||
services.pppd = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -152,7 +152,6 @@ in
|
|||
|
||||
sops.secrets = lib.listToAttrs (map
|
||||
(name: lib.nameValuePair "asterisk-${name}" {
|
||||
sopsFile = ../../secrets.yaml;
|
||||
owner = config.users.users.asterisk.name;
|
||||
})
|
||||
secretConfigFiles);
|
||||
|
|
|
|||
|
|
@ -4,10 +4,7 @@ let
|
|||
inherit (config.networking) ports;
|
||||
in
|
||||
{
|
||||
sops.secrets.myintercom-doorbell-password = {
|
||||
sopsFile = ../secrets.yaml;
|
||||
owner = "asterisk";
|
||||
};
|
||||
sops.secrets.myintercom-doorbell-password.owner = "asterisk";
|
||||
services.myintercom-doorbell = {
|
||||
enable = true;
|
||||
host = "sprechanlage.lan.kbh.jalr.de";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
sops.secrets.duckdns-secret = {
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
services.ddclient = {
|
||||
enable = true;
|
||||
interval = "1min";
|
||||
|
|
|
|||
|
|
@ -6,10 +6,7 @@ let
|
|||
inherit (config.networking) ports;
|
||||
in
|
||||
{
|
||||
sops.secrets.esphome = {
|
||||
sopsFile = ../../secrets.yaml;
|
||||
restartUnits = [ config.systemd.services.esphome.name ];
|
||||
};
|
||||
sops.secrets.esphome.restartUnits = [ config.systemd.services.esphome.name ];
|
||||
|
||||
jalr.esphome = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
{
|
||||
sops.secrets.ntfy_shiftphone = {
|
||||
sopsFile = ../secrets.yaml;
|
||||
owner = "jalr";
|
||||
};
|
||||
sops.secrets.ntfy_shiftphone.owner = "jalr";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,10 +3,7 @@ let
|
|||
inherit (config.networking) ports;
|
||||
in
|
||||
{
|
||||
sops.secrets.calibre-htpasswd = {
|
||||
owner = "nginx";
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
sops.secrets.calibre-htpasswd.owner = "nginx";
|
||||
|
||||
services = {
|
||||
calibre-server = {
|
||||
|
|
|
|||
|
|
@ -3,9 +3,6 @@ let
|
|||
interfaces = import ../interfaces.nix;
|
||||
in
|
||||
{
|
||||
sops.secrets.duckdns-secret = {
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
services.ddclient = {
|
||||
enable = true;
|
||||
interval = "1min";
|
||||
|
|
|
|||
|
|
@ -6,10 +6,7 @@ let
|
|||
inherit (config.networking) ports;
|
||||
in
|
||||
{
|
||||
sops.secrets.esphome = {
|
||||
sopsFile = ../../secrets.yaml;
|
||||
restartUnits = [ config.systemd.services.esphome.name ];
|
||||
};
|
||||
sops.secrets.esphome.restartUnits = [ config.systemd.services.esphome.name ];
|
||||
|
||||
jalr.esphome = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -5,19 +5,10 @@ let
|
|||
domain = "hass.jalr.de";
|
||||
in
|
||||
{
|
||||
sops.secrets = {
|
||||
home-assistant = {
|
||||
sopsFile = ../secrets.yaml;
|
||||
owner = "root";
|
||||
group = "hass";
|
||||
mode = "0640";
|
||||
};
|
||||
"mqtt-users/home-assistant" = {
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
"mqtt-users/valetudo" = {
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
sops.secrets.home-assistant = {
|
||||
owner = "root";
|
||||
group = "hass";
|
||||
mode = "0640";
|
||||
};
|
||||
|
||||
networking.firewall.interfaces = {
|
||||
|
|
|
|||
|
|
@ -4,10 +4,7 @@ let
|
|||
inherit (config.networking) ports;
|
||||
in
|
||||
{
|
||||
#sops.secrets."domain_key_jalr.de" = {
|
||||
# sopsFile = ../secrets.yaml;
|
||||
# owner = "rspamd";
|
||||
#};
|
||||
#sops.secrets."domain_key_jalr.de".owner = "rspamd";
|
||||
jalr = {
|
||||
mailserver = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -6,12 +6,7 @@ let
|
|||
signalUser = "jalr";
|
||||
in
|
||||
{
|
||||
sops.secrets = {
|
||||
synapse-turn-shared-secret = {
|
||||
owner = "matrix-synapse";
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
};
|
||||
sops.secrets.synapse-turn-shared-secret.owner = "matrix-synapse";
|
||||
jalr.matrix = {
|
||||
enable = true;
|
||||
fqdn = "matrix.jalr.de";
|
||||
|
|
|
|||
|
|
@ -30,9 +30,6 @@ in
|
|||
LoadCredential = "PasswordEncryptionKey:${passwordEncryptionKeyFile}";
|
||||
};
|
||||
};
|
||||
sops.secrets.navidrome-password-encryption-key = {
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
services.nginx.virtualHosts."navidrome.jalr.de" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
|
|
|||
|
|
@ -26,10 +26,6 @@ let
|
|||
'';
|
||||
in
|
||||
{
|
||||
sops.secrets."photoprism/oidc-secret" = {
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
|
||||
systemd.services.photoprism.serviceConfig.LoadCredential = lib.mkForce "PHOTOPRISM_OIDC_SECRET_FILE:${config.sops.secrets."photoprism/oidc-secret".path}";
|
||||
|
||||
services.photoprism = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (config.networking) ports;
|
||||
|
|
@ -13,15 +13,6 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
sops.secrets = lib.listToAttrs (map
|
||||
(name: lib.nameValuePair "wireguard_key_${name}" {
|
||||
sopsFile = ../secrets.yaml;
|
||||
})
|
||||
[
|
||||
"hetzner-ha"
|
||||
]
|
||||
);
|
||||
|
||||
networking = {
|
||||
iproute2 = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -4,10 +4,7 @@ let
|
|||
inherit (config.networking) ports;
|
||||
in
|
||||
{
|
||||
sops.secrets.radicale-htpasswd = {
|
||||
owner = "nginx";
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
sops.secrets.radicale-htpasswd.owner = "nginx";
|
||||
|
||||
services.nginx.virtualHosts = {
|
||||
"cal.jalr.de" = {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ let
|
|||
in
|
||||
{
|
||||
sops.secrets.rmfakecloud = {
|
||||
sopsFile = ../secrets.yaml;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
mode = "0400";
|
||||
|
|
|
|||
4
hosts/iron/services/swingmusic.nix
Normal file
4
hosts/iron/services/swingmusic.nix
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.swingmusic ];
|
||||
}
|
||||
|
|
@ -5,10 +5,6 @@ let
|
|||
listenPort = ports.wireguard-esphome.udp;
|
||||
in
|
||||
{
|
||||
sops.secrets."wireguard_key/esphome" = {
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
|
||||
networking = {
|
||||
firewall.allowedUDPPorts = [ listenPort ];
|
||||
wireguard.interfaces.esphome = {
|
||||
|
|
|
|||
|
|
@ -6,10 +6,7 @@ let
|
|||
inherit (config.networking) ports;
|
||||
in
|
||||
{
|
||||
sops.secrets.turn-static-auth-secret = {
|
||||
owner = "turnserver";
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
sops.secrets.turn-static-auth-secret.owner = "turnserver";
|
||||
|
||||
services.coturn = (
|
||||
if ports.coturn-plain.tcp != ports.coturn-plain.udp then builtins.abort "coturn: plain TCP and UDP ports must match."
|
||||
|
|
|
|||
|
|
@ -5,10 +5,7 @@ let
|
|||
inherit (config.networking) ports;
|
||||
in
|
||||
{
|
||||
sops.secrets.forgejo-mail = {
|
||||
owner = cfg.user;
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
sops.secrets.forgejo-mail.owner = cfg.user;
|
||||
services.forgejo = {
|
||||
enable = true;
|
||||
lfs.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
sops.secrets.gitlab-runner_fablab-nea-hcloud-labsync = {
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
services.gitlab-runner = {
|
||||
enable = true;
|
||||
extraPackages = [
|
||||
|
|
|
|||
|
|
@ -6,10 +6,7 @@ let
|
|||
inherit (config.networking) ports;
|
||||
in
|
||||
{
|
||||
sops.secrets.hedgedoc-session-secret = {
|
||||
owner = config.systemd.services.hedgedoc.serviceConfig.User;
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
sops.secrets.hedgedoc-session-secret.owner = config.systemd.services.hedgedoc.serviceConfig.User;
|
||||
services = {
|
||||
hedgedoc = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -5,10 +5,6 @@ let
|
|||
cfg = config.services.mealie;
|
||||
in
|
||||
{
|
||||
sops.secrets.mealie = {
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
|
||||
services.mealie = {
|
||||
enable = true;
|
||||
credentialsFile = config.sops.secrets.mealie.path;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, ... }:
|
||||
{ config, ... }:
|
||||
|
||||
let
|
||||
listenPort = ports.wireguard-public-ip-tunnel.udp;
|
||||
|
|
@ -6,15 +6,6 @@ let
|
|||
inherit (config.networking) ports;
|
||||
in
|
||||
{
|
||||
sops.secrets = lib.listToAttrs (map
|
||||
(name: lib.nameValuePair "wireguard_key_${name}" {
|
||||
sopsFile = ../secrets.yaml;
|
||||
})
|
||||
[
|
||||
"hetzner-ha"
|
||||
]
|
||||
);
|
||||
|
||||
#boot.kernel.sysctl = {
|
||||
# "net.ipv4.conf.all.forwarding" = 1;
|
||||
# "net.ipv4.conf.hetzner-ha.proxy_arp" = 1;
|
||||
|
|
|
|||
|
|
@ -7,10 +7,6 @@ let
|
|||
inherit (config.networking) ports;
|
||||
in
|
||||
{
|
||||
sops.secrets."tandoor/secret_key" = {
|
||||
sopsFile = ../secrets.yaml;
|
||||
};
|
||||
|
||||
services.tandoor-recipes = {
|
||||
enable = true;
|
||||
port = ports.tandoor.tcp;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue