From ad3f095f8602b8de0d06e1a89e4b1ed30dbdc95d Mon Sep 17 00:00:00 2001 From: Arti Zirk Date: Mon, 14 Nov 2016 11:23:00 +0200 Subject: [PATCH] server changes --- api/uwsgi.ini | 2 +- metainfo-dl.py | 2 +- uwsgi.ini | 9 +++++---- web-interface.py | 4 ++-- web_interface.py | 1 + wsgi.py | 8 ++++++++ 6 files changed, 18 insertions(+), 8 deletions(-) create mode 120000 web_interface.py create mode 100644 wsgi.py diff --git a/api/uwsgi.ini b/api/uwsgi.ini index 7211e4b..fef1b70 100644 --- a/api/uwsgi.ini +++ b/api/uwsgi.ini @@ -19,5 +19,5 @@ manage-script-name = true [prod] ini=:uwsgi module=karumedia -chdir=/srv/http/karumedia +chdir=/srv/http/KaruMediaServer/api socket=/run/uwsgi/karumedia diff --git a/metainfo-dl.py b/metainfo-dl.py index 5b03984..0ab0c68 100644 --- a/metainfo-dl.py +++ b/metainfo-dl.py @@ -12,7 +12,7 @@ import subprocess logging.basicConfig(level=logging.DEBUG) -movie_dir = "/media/kraam/Videod/Filmid/Nimed" +movie_dir = "/home/arti/Videod/Filmid" imdb = Imdb() diff --git a/uwsgi.ini b/uwsgi.ini index cf86a9c..bd1fafc 100644 --- a/uwsgi.ini +++ b/uwsgi.ini @@ -1,11 +1,12 @@ [uwsgi] -logger = syslog:karu-media-web -plugin = python -socket = /run/uwsgi/karu-media -chdir = /srv/karu-media +#logger = syslog:karu-media-web +#plugin = python +socket = /run/uwsgi/karumedia-web +chdir = /srv/http/KaruMediaServer module = web-interface callable = app processes = 1 threads = 2 master = true venv = venv +need-app=true diff --git a/web-interface.py b/web-interface.py index 16ac3e5..a5b6f4a 100644 --- a/web-interface.py +++ b/web-interface.py @@ -6,8 +6,8 @@ from flask import render_template from flask import request from urllib.parse import quote_plus -movie_base = "/media/kraam/Videod/Filmid" -movie_dir = movie_base+"/Nimed" +movie_base = "/home/arti/Videod/Filmid" +movie_dir = movie_base app = Flask(__name__) diff --git a/web_interface.py b/web_interface.py new file mode 120000 index 0000000..2c6f66c --- /dev/null +++ b/web_interface.py @@ -0,0 +1 @@ +web-interface.py \ No newline at end of file diff --git a/wsgi.py b/wsgi.py new file mode 100644 index 0000000..32def3e --- /dev/null +++ b/wsgi.py @@ -0,0 +1,8 @@ +from web_interface import app as application + +if __name__ == "__main__": + from wsgiref.simple_server import make_server + + httpd = make_server('0.0.0.0', 8080, application) + print("Serving on http://0.0.0.0:8080/") + httpd.serve_forever()