Revert "log to file"

This reverts commit 1a8d940a90.

.gitignore

@@ -12,4 +12,3 @@ result*
 *screenshot.png
 output
 todo
-log/

infra/machines/fedi201/fedipanel.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   ...
 }:
 let
@@ -56,11 +55,6 @@ in
         COMPRESS_OFFLINE = true;
         LIBSASS_OUTPUT_STYLE = "compressed";
       };
-    environment = {
-      TF_VARS = lib.strings.toJSON {
-        ssh_private_key_file = config.age.secrets.panel-ssh-key.path;
-      };
-    };
     secrets = {
       SECRET_KEY = config.age.secrets.panel-secret-key.path;
     };

panel/default.nix

@@ -31,7 +31,6 @@ in
         DATABASE_URL = "sqlite:///${toString ./src}/db.sqlite3";
         # locally: use a fixed relative reference, so we can use our newest files without copying to the store
         REPO_DIR = toString ../.;
-        LOGGING_DIR = "../log";
       };
     shellHook = ''
       ln -sf ${sources.htmx}/dist/htmx.js src/panel/static/htmx.min.js

panel/env.nix

@@ -13,5 +13,5 @@
     pkgs.gnugrep # used in terraform-nixos
     (import ../launch/tf.nix { inherit lib pkgs; })
   ];
-  TF_VARS = lib.strings.toJSON { };
+  SSH_PRIVATE_KEY_FILE = "";
 }

panel/nix/configuration.nix

@@ -30,7 +30,7 @@ let
       (builtins.toFile "extra-settings.py" cfg.extra-settings)
     ];
     REPO_DIR = import ../../launch/tf-env.nix { inherit lib pkgs; };
-    LOGGING_DIR = "/var/log/${name}";
+    SSH_PRIVATE_KEY_FILE = config.age.secrets.panel-ssh-key.path;
   };
 
   python-environment = pkgs.python3.withPackages (

panel/src/panel/settings.py

@@ -176,9 +176,6 @@ COMPRESS_PRECOMPILERS = [
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
-logging_dir = env["LOGGING_DIR"]
-os.makedirs(logging_dir, mode=0o700, exist_ok=True)
-
 LOGGING = {
     "version": 1,
     "disable_existing_loggers": False,
@@ -213,15 +210,10 @@ LOGGING = {
             "filters": ["require_debug_false"],
             "class": "django.utils.log.AdminEmailHandler",
         },
-        "file": {
-            "level": "INFO",
-            "class": "logging.FileHandler",
-            "filename": f"{logging_dir}/info.log",
-        },
     },
     "loggers": {
         "django": {
-            "handlers": ["console", "mail_admins", "file"],
+            "handlers": ["console", "mail_admins"],
             "level": "INFO",
         },
         "django.server": {
@@ -259,5 +251,6 @@ bin_path=env['BIN_PATH']
 # to deploy this should be specified, for dev just use a relative path.
 repo_dir = env["REPO_DIR"]
 
-ENV_VARS = json.loads(env["TF_VARS"]) | {
+ENV_VARS = {
+    "ssh_private_key_file": env["SSH_PRIVATE_KEY_FILE"],
 }