kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-18 19:11:08 +01:00
Code Releases Activity

secrets: use new structure

Browse Source
This commit is contained in:
Kierán Meinhardt
2019-06-17 17:13:35 +02:00
parent 01e81a8eef
commit 96271c76a6
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configs/cloud.nix
View File

@@ -34,8 +34,8 @@
krebs.syncthing = rec { krebs.syncthing = rec {
enable = true; enable = true;
id = config.networking.hostName; id = config.networking.hostName;
key = toString <secrets/syncthing-key.pem>; key = toString <secrets/syncthing/key.pem>;
cert = toString <secrets/syncthing-cert.pem>; cert = toString <secrets/syncthing/cert.pem>;
peers = { peers = {
homeros.id = "HSOL72W-MMN346W-C3WCWCH-OTRKJYG-MY2WWV6-P7JUHN7-5WYYYRV-ZMH4KAA"; homeros.id = "HSOL72W-MMN346W-C3WCWCH-OTRKJYG-MY2WWV6-P7JUHN7-5WYYYRV-ZMH4KAA";
scardanelli.id = "7CZYHEX-3CSFDQU-PEEMYHG-6XGQ2ZD-KGVUWH5-GFRB2XK-FP57ERX-7APZUQU"; scardanelli.id = "7CZYHEX-3CSFDQU-PEEMYHG-6XGQ2ZD-KGVUWH5-GFRB2XK-FP57ERX-7APZUQU";

2
deploy.nix
View File

@@ -43,7 +43,7 @@ let
ref = "1340e3fb"; ref = "1340e3fb";
}; };
secrets.pass = { secrets.pass = {
dir = toString ~/.password-store; dir = toString ~/.password-store/niveum/systems;
inherit name; inherit name;
}; };
art.file = toString ./art; art.file = toString ./art;

2
systems/catullus/configuration.nix
View File

@@ -149,7 +149,7 @@ in {
}; };
environment.etc."tinc/retiolum/rsa_key.priv" = { environment.etc."tinc/retiolum/rsa_key.priv" = {
text = builtins.readFile <secrets/retiolum.rsa_key.priv>; text = builtins.readFile <secrets/retiolum.key>;
mode = "400"; mode = "400";
}; };
} }

12
systems/catullus/containers.nix
View File

@@ -25,7 +25,7 @@ in {
niveum.telegramBots.quotebot = { niveum.telegramBots.quotebot = {
enable = true; enable = true;
time = "08/6:00"; time = "08/6:00";
token = lib.strings.removeSuffix "\n" (builtins.readFile <secrets/telegram-kmein.token>); token = lib.strings.removeSuffix "\n" (builtins.readFile <secrets/telegram/kmein.token>);
chatIds = [ "18980945" "757821027" ]; chatIds = [ "18980945" "757821027" ];
command = "${pkgs.literature-quote}/bin/literature-quote"; command = "${pkgs.literature-quote}/bin/literature-quote";
parseMode = "Markdown"; parseMode = "Markdown";
@@ -34,7 +34,7 @@ in {
niveum.telegramBots.autorenkalender = { niveum.telegramBots.autorenkalender = {
enable = true; enable = true;
time = "07:00"; time = "07:00";
token = lib.strings.removeSuffix "\n" (builtins.readFile <secrets/telegram-kmein.token>); token = lib.strings.removeSuffix "\n" (builtins.readFile <secrets/telegram/kmein.token>);
chatIds = [ "@autorenkalender" ]; chatIds = [ "@autorenkalender" ];
command = "${pkgs.autorenkalender}/bin/autorenkalender"; command = "${pkgs.autorenkalender}/bin/autorenkalender";
}; };
@@ -42,7 +42,7 @@ in {
systemd.services.telegram-odyssey = { systemd.services.telegram-odyssey = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
description = "Telegram bot reciting the Odyssey to you"; description = "Telegram bot reciting the Odyssey to you";
environment.TELEGRAM_ODYSSEY_TOKEN = builtins.readFile <secrets/telegram-odyssey.token>; environment.TELEGRAM_ODYSSEY_TOKEN = builtins.readFile <secrets/telegram/odyssey.token>;
enable = true; enable = true;
script = ''${pkgs.telegram-odyssey}/bin/telegram-odyssey''; script = ''${pkgs.telegram-odyssey}/bin/telegram-odyssey'';
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";
@@ -51,7 +51,7 @@ in {
systemd.services.telegram-reverse = { systemd.services.telegram-reverse = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
description = "Telegram bot for reversing things"; description = "Telegram bot for reversing things";
environment.TELEGRAM_REVERSE_TOKEN = builtins.readFile <secrets/telegram-reverse.token>; environment.TELEGRAM_REVERSE_TOKEN = builtins.readFile <secrets/telegram/reverse.token>;
enable = true; enable = true;
script = ''${pkgs.telegram-reverse}/bin/telegram-reverse''; script = ''${pkgs.telegram-reverse}/bin/telegram-reverse'';
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";
@@ -60,7 +60,7 @@ in {
systemd.services.telegram-betacode = { systemd.services.telegram-betacode = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
description = "Telegram bot for converting Ancient Greek betacode into unicode"; description = "Telegram bot for converting Ancient Greek betacode into unicode";
environment.TELEGRAM_BETACODE_TOKEN = builtins.readFile <secrets/telegram-betacode.token>; environment.TELEGRAM_BETACODE_TOKEN = builtins.readFile <secrets/telegram/betacode.token>;
enable = true; enable = true;
script = ''${pkgs.telegram-betacode}/bin/telegram-betacode''; script = ''${pkgs.telegram-betacode}/bin/telegram-betacode'';
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";
@@ -69,7 +69,7 @@ in {
systemd.services.telegram-proverb = { systemd.services.telegram-proverb = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
description = "Telegram bot for generating inspiring but useless proverbs"; description = "Telegram bot for generating inspiring but useless proverbs";
environment.TELEGRAM_PROVERB_TOKEN = builtins.readFile <secrets/telegram-proverb.token>; environment.TELEGRAM_PROVERB_TOKEN = builtins.readFile <secrets/telegram/proverb.token>;
enable = true; enable = true;
script = ''${pkgs.telegram-proverb}/bin/proverb_bot.py''; script = ''${pkgs.telegram-proverb}/bin/proverb_bot.py'';
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";