Compare commits

...

2 commits

Author SHA1 Message Date
fruchti f373ec2d15 Emitter: DNS-lookup BURP server, use more retries 2023-06-21 15:27:57 +02:00
fruchti e43c6450d9 Emitter: Fix warnings for 23.05 2023-06-21 15:27:22 +02:00
2 changed files with 11 additions and 9 deletions

View file

@ -5,7 +5,6 @@
];
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/vda";
networking.hostName = "Emitter";
@ -98,6 +97,7 @@
cat > $out/sbin/burp <<-EOF
#!/${pkgs.bash}/bin/bash
set -e
${pkgs.dig}/bin/nslookup rupert.gvfr.de
${pkgs.unixtools.ping}/bin/ping -c1 rupert.gvfr.de >/dev/null
${pkgs.openssh}/bin/ssh -i /secrets/id_burp_remote -o IdentitiesOnly=yes -o ExitOnForwardFailure=yes -L 4971:localhost:4971 burp-remote@rupert.gvfr.de -f true
$out/sbin/burp-untunneled \$@
@ -121,7 +121,7 @@
services.statusEmail.enable = true;
systemd.services.burp-client = let
retryDelay = 10 * 60;
maxRetries = 3;
maxRetries = 5;
in {
unitConfig = {
OnFailure = "status-email@%n.service";

View file

@ -16,9 +16,6 @@ in
passwordFile = "/secrets/gitea_db_password";
createDatabase = false;
};
domain = "${domain}";
rootUrl = "https://${domain}/";
httpPort = 3001;
repositoryRoot = "/data/git/repositories";
lfs = {
enable = true;
@ -30,9 +27,9 @@ in
docutils # Provides rendering of ReStructured Text files
pygments # Provides syntax highlighting
]);
nbconvert =
pkgs.python310.withPackages (ps: with ps; [
nbconvert = pkgs.python310.withPackages (ps: with ps; [
jupyter
ipykernel
nbconvert
]);
max_cached_jupyter_notebooks = 200;
@ -67,7 +64,12 @@ in
'';
in
{
server.SSH_PORT = lib.head config.services.openssh.ports;
server = {
SSH_PORT = lib.head config.services.openssh.ports;
ROOT_URL = "https://${domain}/";
HTTP_PORT = 3001;
DOMAIN = "${domain}";
};
service.DISABLE_REGISTRATION = true;
session.COOKIE_SECURE = true;
"markup.restructuredtext" = {
@ -79,7 +81,7 @@ in
"markup.jupyter" = {
ENABLED = true;
FILE_EXTENSIONS = ".ipynb";
#RENDER_COMMAND = "\"${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic \"";
# RENDER_COMMAND = "\"${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic \"";
RENDER_COMMAND = "\"${cached_jupyter_preview} \"";
IS_INPUT_FILE = true;
# RENDER_CONTENT_MODE = "iframe";