mirror of
https://github.com/kmein/niveum
synced 2026-03-26 14:21:07 +01:00
Compare commits
3 Commits
feature/ha
...
a4f3c98fae
| Author | SHA1 | Date | |
|---|---|---|---|
| a4f3c98fae | |||
| f403319fea | |||
| d0b405fb15 |
@@ -107,7 +107,7 @@ in {
|
|||||||
folders = let
|
folders = let
|
||||||
cloud-dir = "${config.users.users.me.home}/cloud";
|
cloud-dir = "${config.users.users.me.home}/cloud";
|
||||||
in {
|
in {
|
||||||
"${cloud-dir}/syncthing/zotero".devices = ["kabsa" "manakish"];
|
"${cloud-dir}/syncthing/zotero/storage".devices = ["kabsa" "manakish"];
|
||||||
"${cloud-dir}/syncthing/common".devices = ["kabsa" "manakish"];
|
"${cloud-dir}/syncthing/common".devices = ["kabsa" "manakish"];
|
||||||
"${cloud-dir}/syncthing/library".devices = ["kabsa" "manakish" "heym"];
|
"${cloud-dir}/syncthing/library".devices = ["kabsa" "manakish" "heym"];
|
||||||
"${cloud-dir}/syncthing/mundoiu".devices = ["kabsa" "manakish" "heym"];
|
"${cloud-dir}/syncthing/mundoiu".devices = ["kabsa" "manakish" "heym"];
|
||||||
|
|||||||
@@ -181,20 +181,17 @@ in {
|
|||||||
systemd.services.hu-vpn = {
|
systemd.services.hu-vpn = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wants = ["network-online.target"];
|
wants = ["network-online.target"];
|
||||||
serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhark.path}";
|
serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhaki.path}";
|
||||||
script = ''
|
script = ''
|
||||||
if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
|
${pkgs.openfortivpn}/bin/openfortivpn \
|
||||||
then
|
--password="$(cat "$CREDENTIALS_DIRECTORY/password")" \
|
||||||
${pkgs.openfortivpn}/bin/openfortivpn \
|
--config=${
|
||||||
--password="$(cat "$CREDENTIALS_DIRECTORY/password")" \
|
|
||||||
--config=${
|
|
||||||
pkgs.writeText "hu-berlin.config" ''
|
pkgs.writeText "hu-berlin.config" ''
|
||||||
host = forti-ssl.vpn.hu-berlin.de
|
host = forti-ssl.vpn.hu-berlin.de
|
||||||
port = 443
|
port = 443
|
||||||
username = meinhark
|
username = meinhaki
|
||||||
''
|
''
|
||||||
}
|
}
|
||||||
fi
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -263,6 +263,9 @@ in {
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# otherwise bearer_token_file will fail
|
||||||
|
services.prometheus.checkConfig = "syntax-only";
|
||||||
|
|
||||||
services.prometheus.scrapeConfigs = [
|
services.prometheus.scrapeConfigs = [
|
||||||
{
|
{
|
||||||
job_name = "makanek";
|
job_name = "makanek";
|
||||||
|
|||||||
Reference in New Issue
Block a user