increase timeouts; don't allow container creation from internal images

coco-project · Aug 11, 2015 · 6127adc · 6127adc
1 parent cc89acf
commit 6127adc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/ipynbsrv/core/models.py b/ipynbsrv/core/models.py
@@ -544,6 +544,10 @@ def clean(self):
                 raise ValidationError({
                     'server': 'A clone can only be created on the same node as it\'s parent.'
                 })
+            if self.image and self.image.is_internal:
+                raise ValidationError({
+                    'image': 'Internal images cannot be used to create containers from.'
+                })
         super(Container, self).clean()
 
     def clone(self, name, description=None):

diff --git a/lib/confs/nginx/ipynbsrv.conf b/lib/confs/nginx/ipynbsrv.conf
@@ -16,8 +16,8 @@ server {
 
     location / {
         include      /usr/local/openresty/nginx/conf/uwsgi_params;
-        uwsgi_read_timeout  300s;
-        uwsgi_send_timeout  300s;
+        uwsgi_read_timeout  600s;
+        uwsgi_send_timeout  600s;
         uwsgi_param  REQUEST_URI  $uri$args;
         uwsgi_pass   unix:/var/run/ipynbsrv/ipynbsrv.sock;
     }

diff --git a/lib/confs/uwsgi/ipynbsrv.ini b/lib/confs/uwsgi/ipynbsrv.ini
@@ -8,8 +8,8 @@ master=True
 vacuum=True
 max-requests=5000
 processes=5
-harakiri=300
-chmod-socket = 660
-chown-socket = www-data:www-data
+harakiri=600
+chmod-socket=660
+chown-socket=www-data:www-data
 pidfile=/var/run/ipynbsrv/ipynbsrv.pid
 uwsgi-socket=/var/run/ipynbsrv/ipynbsrv.sock