fix logging levels so info gets shown too, not just warn

launch/main.tf

@@ -73,6 +73,7 @@ variable "deploy_environment" {
 #   initialUser = var.initialUser
 #   terraform-nixos = var.terraform-nixos
 #   ssh_private_key_file = var.ssh_private_key_file
+#   deploy_environment = var.deploy_environment
 # }
 
 module "mastodon" {
@@ -84,6 +85,7 @@ module "mastodon" {
   initialUser = var.initialUser
   terraform-nixos = var.terraform-nixos
   ssh_private_key_file = var.ssh_private_key_file
+  deploy_environment = var.deploy_environment
 }
 
 module "pixelfed" {
@@ -95,6 +97,7 @@ module "pixelfed" {
   initialUser = var.initialUser
   terraform-nixos = var.terraform-nixos
   ssh_private_key_file = var.ssh_private_key_file
+  deploy_environment = var.deploy_environment
 }
 
 module "peertube" {
@@ -106,4 +109,5 @@ module "peertube" {
   initialUser = var.initialUser
   terraform-nixos = var.terraform-nixos
   ssh_private_key_file = var.ssh_private_key_file
+  deploy_environment = var.deploy_environment
 }

launch/vm/main.tf

@@ -48,6 +48,7 @@ module "deploy" {
   target_user= "root" # FIXME: #24
   target_system = local.system
   NIX_PATH = "nixpkgs=${local.nixpkgs}:sources=${local.sources}"
+  deploy_environment = var.deploy_environment
   hermetic = true
   config_pwd = path.root
   config = <<-EOT

panel/nix/configuration.nix

@@ -159,16 +159,14 @@ in
       };
     };
 
-    users.users.${name} = {
+    users.users.${name}.isNormalUser = true;
-      isNormalUser = true;
-    };
 
-    users.groups.${name} = { };
     systemd.services.${name} = {
       description = "${name} ASGI server";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       path = [
+        pkgs.openssh
         python-environment
         manage-service
       ];
@@ -187,7 +185,7 @@ in
       '';
       serviceConfig = {
         Restart = "always";
-        User = "root";
+        User = name;
         WorkingDirectory = "/var/lib/${name}";
         StateDirectory = name;
         RuntimeDirectory = name;

panel/src/panel/settings.py

@@ -192,13 +192,17 @@ LOGGING = {
             "()": "django.utils.log.ServerFormatter",
             "format": "[{server_time}] {message}",
             "style": "{",
-        }
+        },
+        "standard": {
+            "format": "%(asctime)s [%(levelname)s] %(name)s: %(message)s"
+        },
     },
     "handlers": {
         "console": {
             "level": "INFO",
             # "filters": ["require_debug_true"],
             "class": "logging.StreamHandler",
+            "formatter": "standard",
         },
         "django.server": {
             "level": "INFO",
@@ -212,14 +216,9 @@ LOGGING = {
         },
     },
     "loggers": {
-        "django": {
+        "": {
-            "handlers": ["console", "mail_admins"],
+            "handlers": ["console"],
-            "level": "INFO",
+            "level": "DEBUG" if DEBUG else "INFO",
-        },
-        "django.server": {
-            "handlers": ["django.server"],
-            "level": "INFO",
-            "propagate": False,
         },
     },
 }
@@ -251,6 +250,11 @@ bin_path=env['BIN_PATH']
 # to deploy this should be specified, for dev just use a relative path.
 repo_dir = env["REPO_DIR"]
 
+output = subprocess.run(["ssh-agent"], capture_output=True, text=True, env={"PATH": bin_path}).stdout
+ssh_auth_sock = re.search("(?<==)([^;]*)", output)[1]
 ENV_VARS = {
     "ssh_private_key_file": env["SSH_PRIVATE_KEY_FILE"],
+    "deploy_environment": {
+        "SSH_AUTH_SOCK": ssh_auth_sock,
+    },
 }

panel/src/panel/views.py

@@ -15,6 +15,8 @@ from django.shortcuts import render
 from panel import models, settings
 from panel.configuration import forms
 
+logger = logging.getLogger(__name__)
+
 
 class Index(TemplateView):
     template_name = 'index.html'