Merge branch 'develop' of gitlab.com:OldminTeam/expomap into develop

project.wsgi

@@ -1,13 +0,0 @@
-import os, sys
-sys.path.append('/home/www/proj')
-
-
-
-#sys.path.append("/home/www/proj/organiser")
-
-#os.environ['DJANGO_SETTINGS_MODULE'] = 'proj.settings'
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "proj.settings")
-
-import django.core.handlers.wsgi
-application = django.core.handlers.wsgi.WSGIHandler()

requirements.txt

@@ -1,6 +1,7 @@
 awesome-slugify==1.6
 BeautifulSoup==3.2.1
 beautifulsoup4==4.4.0
+chainmap==1.0.2
 chardet==2.3.0
 contextlib2==0.5.4
 DAWG-Python==0.7.2
@@ -17,6 +18,7 @@ django-modeltranslation==0.12
 django-multiupload==0.5
 django-redis==4.0.0
 django-redis-cache==0.13.1
+django-rosetta==0.7.6
 django-sortedm2m==1.2.0
 django-tinymce==2.0.5
 django-widget-tweaks==1.4.1
@@ -28,6 +30,7 @@ gnureadline==6.3.3
 html2text==2015.6.21
 ipython==2.2.0
 lxml==3.5.0b1
+microsofttranslator==0.5
 MySQL-python==1.2.5
 nltk==3.2.2
 numpy==1.12.0
@@ -35,6 +38,7 @@ oauthlib==0.6.1
 pandas==0.19.2
 phonenumbers==6.0.0
 Pillow==2.5.3
+polib==1.0.8
 pylibmc==1.2.3
 pymorphy==0.5.6
 pymorphy2==0.8
@@ -61,6 +65,7 @@ South==1.0.2
 sqlparse==0.1.11
 suds==0.4
 Unidecode==0.4.16
+uWSGI==2.0.14
 vobject==0.8.2
 wstools==0.4.3
 xlrd==0.9.2

support/apache.conf

@@ -1,32 +0,0 @@
-<VirtualHost 127.0.0.1:8080>
-    WSGIDaemonProcess www-data display-name=%{GROUP} processes=2 threads=2
-    WSGIProcessGroup www-data
-    WSGIScriptAlias / "/home/www/proj/project.wsgi"
-    ServerName 176.121.11.165
-     <Directory "/home/www/proj/">
-         Order allow,deny
-         Options Indexes FollowSymLinks
-         Allow from all
-         IndexOptions FancyIndexing
-     </Directory>
-
-    Alias /media "/home/www/proj/media/"
-    Alias /static "/home/www/proj/static/"
-
-
-    <Directory "/home/www/proj/media">
-    Order allow,deny
-        Options Indexes FollowSymLinks
-        Allow from all
-        IndexOptions FancyIndexing
-    </Directory>
-    <Directory "/home/www/proj/static">
-    	Order allow,deny
-        Options Indexes FollowSymLinks
-        Allow from all
-        IndexOptions FancyIndexing
-    </Directory>
-
-    ErrorLog /var/log/apache2/expo.error.log
-    CustomLog /var/log/apache2/expo.access.log combined
-</VirtualHost>

support/nginx.conf

@@ -18,24 +18,20 @@ server {
     add_header Strict-Transport-Security "max-age=31536000;";
     add_header Content-Security-Policy-Report-Only "default-src https:; script-src https: 'unsafe-eval' 'unsafe-inline'; style-src https: 'unsafe-inline'; img-src https: data:; font-src https: data:";
 
+    gzip on;
+    gzip_disable "msie6";
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_comp_level 6;
+    gzip_buffers 16 8k;
+    gzip_http_version 1.1;
+    gzip_static on;
+    gzip_types text/plain text/css application/json application/x-javascript application/javascript text/xml application/xml application/xml+rss text/javascript;
+
     client_header_timeout 360s;
     location / {
-        proxy_pass http://127.0.0.1:8080/;
+        include uwsgi_params;
-        proxy_redirect     off;
+        uwsgi_pass 127.0.0.1:49000;
-        proxy_set_header        Host            $host;
-        proxy_set_header        X-Real-IP       $remote_addr;
-        proxy_set_header        X-Forwarded-For $remote_addr;
-        include /etc/nginx/geoip_proxy.conf;
-        client_max_body_size    100m;
-        client_body_buffer_size 128k;
-
-        proxy_connect_timeout   90;
-        proxy_send_timeout      90;
-        proxy_read_timeout      90;
-        proxy_buffer_size       16k;
-        proxy_buffers           256 8k;
-        proxy_busy_buffers_size 2000k;
-        proxy_temp_file_write_size      2048k;
     }
 
     location /4885b11a73674eb6d54593c1d7efd758821e5ee79b8132feecaba10560f0123a.html {

support/supervisor.conf

@@ -0,0 +1,7 @@
+[program:expomap]
+command=/usr/local/bin/uwsgi -s 127.0.0.1:49000 -M -L -R 5000 --env DJANGO_SETTINGS_MODULE=proj.settings -w "django.core.wsgi:get_wsgi_application()" --touch-reload /home/www/expomap/touch_reload --chdir /home/www/expomap
+stopsignal=INT
+stopwaitsecs=60
+autostart=true
+redirect_stderr=true
+user=www-data