Mplesa omaha sync

Dockerfile-base

@@ -7,7 +7,7 @@ RUN \
   apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys ABF5BD827BD9BF62 && \
   echo 'deb http://nginx.org/packages/ubuntu/ trusty nginx' | tee --append /etc/apt/sources.list && \
   apt-get update && \
-  apt-get install -y --no-install-recommends jq python-pip python-dev python-lxml python-psycopg2 libpq-dev supervisor nginx liblua5.1-dev lua-zlib libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev python-pil build-essential libfuse-dev libcurl4-openssl-dev libxml2-dev mime-support automake libtool pkg-config libssl-dev wget tar && \
+  apt-get install -y --no-install-recommends python-pip python-dev python-lxml python-psycopg2 libpq-dev supervisor nginx liblua5.1-dev lua-zlib libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev python-pil build-essential libfuse-dev libcurl4-openssl-dev libxml2-dev mime-support automake libtool pkg-config libssl-dev wget tar jq && \
   apt-get clean && \
   apt-get autoremove -y && \
   rm -rf /var/lib/{apt,dpkg,cache,log}/  && \

conf/nginx.conf

@@ -7,7 +7,7 @@ load_module modules/ndk_http_module.so;
 load_module modules/ngx_http_lua_module.so;
 
 events {
-	worker_connections 20000;
+	worker_connections 2048;
 	# multi_accept on;
 }
 

conf/uwsgi.ini

@@ -7,5 +7,5 @@ chunked-input-timeout = 300
 socket-timeout = 300
 buffer-size = 65535
 master = 1
-workers = 64
+workers = 512
 listen = 1024

omaha_server/omaha_server/s3utils.py

@@ -6,7 +6,6 @@
 
 import os
 
-
 class BaseS3Storage(S3BotoStorage):
     def url(self, name):
         url = super(BaseS3Storage, self).url(name)
@@ -15,7 +14,7 @@ def url(self, name):
             if 'x-amz-security-token' in f.args:
                 del f.args['x-amz-security-token']
                 url = f.url
-        if os.environ.get('CDN_FRONTEND'):
+        if os.environ.get('CDN_NAME'):
             f = furl(url)
             f.set(host=os.environ.get('CDN_NAME'))
             url = f.url

omaha_server/omaha_server/settings_override.py

@@ -0,0 +1,12 @@
+from .settings_prod import *
+
+# TODO: should work by default
+STATIC_URL = 'https://{}.s3.amazonaws.com/'.format(os.environ.get('AWS_STORAGE_BUCKET_NAME'))
+MEDIA_URL = 'https://{}.s3.amazonaws.com/'.format(os.environ.get('AWS_STORAGE_BUCKET_NAME'))
+
+if os.environ.get('CDN_NAME'):
+    CDN_NAME = os.environ.get('CDN_NAME')
+
+CUP_PEM_KEYS = {
+    '1': '/run/secrets/cup_key'
+}