mirror of
https://github.com/kmein/niveum
synced 2026-03-19 03:21:10 +01:00
fix: hu-vpn conflicts with hu-eduroam
This commit is contained in:
@@ -17,7 +17,7 @@
|
|||||||
"workgroup=german"
|
"workgroup=german"
|
||||||
"credentials=${config.age.secrets.cifs-credentials-hu-berlin.path}"
|
"credentials=${config.age.secrets.cifs-credentials-hu-berlin.path}"
|
||||||
"noauto"
|
"noauto"
|
||||||
"x-systemd.requires=hu-vpn.service"
|
# "x-systemd.requires=hu-vpn.service"
|
||||||
"x-systemd.automount"
|
"x-systemd.automount"
|
||||||
"x-systemd.device-timeout=1"
|
"x-systemd.device-timeout=1"
|
||||||
"x-systemd.idle-timeout=1min"
|
"x-systemd.idle-timeout=1min"
|
||||||
@@ -68,9 +68,11 @@ in {
|
|||||||
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-meinhark.path}";
|
||||||
script = ''
|
script = ''
|
||||||
${pkgs.openfortivpn}/bin/openfortivpn \
|
if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
|
||||||
--password="$(cat "$CREDENTIALS_DIRECTORY/password")" \
|
then
|
||||||
--config=${
|
${pkgs.openfortivpn}/bin/openfortivpn \
|
||||||
|
--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
|
||||||
@@ -78,6 +80,7 @@ in {
|
|||||||
trusted-cert = 9e5dea8e077970d245900839f437ef7fb9551559501c7defd70af70ea568573d
|
trusted-cert = 9e5dea8e077970d245900839f437ef7fb9551559501c7defd70af70ea568573d
|
||||||
''
|
''
|
||||||
}
|
}
|
||||||
|
fi
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user