launch/main.tf

@@ -73,7 +73,6 @@ 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" {
@@ -85,7 +84,6 @@ 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" {
@@ -97,7 +95,6 @@ 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" {
@@ -109,5 +106,4 @@ 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,7 +48,6 @@ 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,14 +159,16 @@ in
       };
     };
 
-    users.users.${name}.isNormalUser = true;
+    users.users.${name} = {
+      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
       ];
@@ -185,7 +187,7 @@ in
       '';
       serviceConfig = {
         Restart = "always";
-        User = name;
+        User = "root";
         WorkingDirectory = "/var/lib/${name}";
         StateDirectory = name;
         RuntimeDirectory = name;

panel/src/panel/settings.py

@@ -192,17 +192,13 @@ 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",
@@ -216,9 +212,14 @@ LOGGING = {
         },
     },
     "loggers": {
-        "": {
-            "handlers": ["console"],
-            "level": "DEBUG" if DEBUG else "INFO",
+        "django": {
+            "handlers": ["console", "mail_admins"],
+            "level": "INFO",
+        },
+        "django.server": {
+            "handlers": ["django.server"],
+            "level": "INFO",
+            "propagate": False,
         },
     },
 }
@@ -250,11 +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"]
 
-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,8 +15,6 @@ 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'