From f6a6bdd7151bc39b3b72eadce0d29eec3f61b428 Mon Sep 17 00:00:00 2001
From: Tomas 'Jethro' Pokorny <xtompok@gmail.com>
Date: Mon, 20 Aug 2018 19:55:30 +0200
Subject: [PATCH] Pridano nastaveni pro uWSGI na gimlim.

---
 mamweb/settings_prod.py |  7 ++++---
 mamweb_prod.ini         | 14 ++++++++++++++
 requirements.txt        |  3 ++-
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 mamweb_prod.ini

diff --git a/mamweb/settings_prod.py b/mamweb/settings_prod.py
index a270b0a6..3c6f0f72 100644
--- a/mamweb/settings_prod.py
+++ b/mamweb/settings_prod.py
@@ -27,7 +27,8 @@ DEBUG = False
 
 TEMPLATE_DEBUG = False
 
-ALLOWED_HOSTS = ['mam.mff.cuni.cz', 'www.mam.mff.cuni.cz', 'atrey.karlin.mff.cuni.cz']
+ALLOWED_HOSTS = ['mam.mff.cuni.cz', 'www.mam.mff.cuni.cz', 'atrey.karlin.mff.cuni.cz', 
+		'mamweb.bezva.org','gimli.ms.mff.cuni.cz']
 
 # Database
 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
@@ -35,8 +36,8 @@ ALLOWED_HOSTS = ['mam.mff.cuni.cz', 'www.mam.mff.cuni.cz', 'atrey.karlin.mff.cun
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'mam-prod',
-        'USER': 'mam',
+        'NAME': 'mam_prod',
+        'USER': 'mam-web',
         'TEST': {
             'NAME': 'mam-prod-testdb',
         },
diff --git a/mamweb_prod.ini b/mamweb_prod.ini
new file mode 100644
index 00000000..c841cdd7
--- /dev/null
+++ b/mamweb_prod.ini
@@ -0,0 +1,14 @@
+[uwsgi]
+socket = /tmp/uwsgi-mamweb_prod.sock
+logto = /akce/mam/www/mamweb_prod.log
+chdir = /akce/mam/www/mamweb-prod/
+home = /akce/mam/www/mamweb-prod/
+
+module = mamweb.wsgi
+plugin = python
+master = True
+vacuum = True
+chmod-socket = 666
+max-requests = 5000
+die-on-term=true
+
diff --git a/requirements.txt b/requirements.txt
index 1800d357..8ec8c518 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,6 @@ six==1.10.0
 pexpect==4.0.1
 traitlets==4.0.0
 Unidecode==0.4.19
-flake8==3.0.4
 
 # Django and modules
 
@@ -48,3 +47,5 @@ Werkzeug==0.11.3
 # requests
 # requests-oauthlib
 
+# uWSGI
+uWSGI==2.0.17.1