Pridano nastaveni pro uWSGI na gimlim.

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',
         },

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
+

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