From c2577dc1e18c9528f183ad9d1194d0a21d980d4f Mon Sep 17 00:00:00 2001
From: Andrey Golovizin <ag@sologoc.com>
Date: Tue, 10 Mar 2020 17:28:04 +0100
Subject: [PATCH] Serve media with nginx

---
 module.nix                  | 9 +++++----
 src/strojnadzor/settings.py | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/module.nix b/module.nix
index 9bc9e71..7411c6e 100644
--- a/module.nix
+++ b/module.nix
@@ -67,8 +67,8 @@ in
     ];
 
     systemd.tmpfiles.rules = [
-      "d '${cfg.stateDir}' - strojnadzor strojnadzor - -"
-      "d '${cfg.stateDir}/data' - strojnadzor strojnadzor - -"
+      "d '${cfg.stateDir}/db' 0700 strojnadzor strojnadzor - -"
+      "d '${cfg.stateDir}/media' 0755 strojnadzor strojnadzor - -"
     ];
 
     systemd.sockets.strojnadzor = {
@@ -93,9 +93,9 @@ in
         Group = "strojnadzor";
         ExecStartPre = "${strojnadzor}/bin/strojnadzor-admin migrate";
         ExecStart = "${strojnadzor}/bin/strojnadzor-admin runserver-gunicorn";
+        StateDirectory = "strojnadzor";
       };
-      environment.STROJNADZOR_DATA_DIR = "${cfg.stateDir}/data";
-      environment.STROJNADZOR_STATIC_DIR = "${static}/static";
+      environment.STROJNADZOR_DATA_DIR = "${cfg.stateDir}";
     };
 
     services.nginx = {
@@ -109,6 +109,7 @@ in
             gzip off;
           '';
           locations."/static/".alias = "${static}/";
+          locations."/media/".alias = "${cfg.stateDir}/media/";
           locations."/" = {
             proxyPass = "http://unix:${cfg.socketPath}";
             extraConfig = ''
diff --git a/src/strojnadzor/settings.py b/src/strojnadzor/settings.py
index ad24743..56fb7da 100644
--- a/src/strojnadzor/settings.py
+++ b/src/strojnadzor/settings.py
@@ -206,7 +206,7 @@ DATABASES = {
         "CONN_MAX_AGE": 0,
         "ENGINE": "django.db.backends.sqlite3",
         "HOST": "localhost",
-        "NAME": os.path.join(DATA_DIR, "project.db"),
+        "NAME": os.path.join(DATA_DIR, "db", "strojnadzor.sqlite3"),
         "PASSWORD": "",
         "PORT": "",
         "USER": "",