ag/strojnadzor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Serve media with nginx

Browse source
This commit is contained in:
Andrey Golovizin 2020-03-10 17:28:04 +01:00
parent b6957198c1
commit c2577dc1e1
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
module.nix
View file

@ -67,8 +67,8 @@ in
]; ];
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d '${cfg.stateDir}' - strojnadzor strojnadzor - -" "d '${cfg.stateDir}/db' 0700 strojnadzor strojnadzor - -"
"d '${cfg.stateDir}/data' - strojnadzor strojnadzor - -" "d '${cfg.stateDir}/media' 0755 strojnadzor strojnadzor - -"
]; ];
systemd.sockets.strojnadzor = { systemd.sockets.strojnadzor = {
@ -93,9 +93,9 @@ in
Group = "strojnadzor"; Group = "strojnadzor";
ExecStartPre = "${strojnadzor}/bin/strojnadzor-admin migrate"; ExecStartPre = "${strojnadzor}/bin/strojnadzor-admin migrate";
ExecStart = "${strojnadzor}/bin/strojnadzor-admin runserver-gunicorn"; ExecStart = "${strojnadzor}/bin/strojnadzor-admin runserver-gunicorn";
StateDirectory = "strojnadzor";
}; };
environment.STROJNADZOR_DATA_DIR = "${cfg.stateDir}/data"; environment.STROJNADZOR_DATA_DIR = "${cfg.stateDir}";
environment.STROJNADZOR_STATIC_DIR = "${static}/static";
}; };
services.nginx = { services.nginx = {
@ -109,6 +109,7 @@ in
gzip off; gzip off;
''; '';
locations."/static/".alias = "${static}/"; locations."/static/".alias = "${static}/";
locations."/media/".alias = "${cfg.stateDir}/media/";
locations."/" = { locations."/" = {
proxyPass = "http://unix:${cfg.socketPath}"; proxyPass = "http://unix:${cfg.socketPath}";
extraConfig = '' extraConfig = ''

2
src/strojnadzor/settings.py
View file

@ -206,7 +206,7 @@ DATABASES = {
"CONN_MAX_AGE": 0, "CONN_MAX_AGE": 0,
"ENGINE": "django.db.backends.sqlite3", "ENGINE": "django.db.backends.sqlite3",
"HOST": "localhost", "HOST": "localhost",
"NAME": os.path.join(DATA_DIR, "project.db"), "NAME": os.path.join(DATA_DIR, "db", "strojnadzor.sqlite3"),
"PASSWORD": "", "PASSWORD": "",
"PORT": "", "PORT": "",
"USER": "", "USER": "",