Merge branch 'ng' into docker-installation-docs

allegro · Feb 5, 2019 · 6a10653 · 6a10653
2 parents 5ee834b + 0d39541
commit 6a10653
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/contrib/common/etc/ralph/conf.d/gunicorn.conf b/contrib/common/etc/ralph/conf.d/gunicorn.conf
@@ -5,3 +5,4 @@ GUNICORN_ERRORLOG=/var/log/ralph/gunicorn.error.log
 GUNICORN_LOGLEVEL=info
 GUNICORN_USER=ralphsrv
 GUNICORN_GROUP=ralphsrv
+GUNICORN_TIMEOUT=30
diff --git a/contrib/common/gunicorn/gunicorn.ini b/contrib/common/gunicorn/gunicorn.ini
@@ -9,3 +9,4 @@ errorlog = os.environ.get('GUNICORN_ERRORLOG', os.path.join(os.environ['RALPH_DI
 loglevel = os.environ.get('GUNICORN_LOGLEVEL', 'info')
 user = os.environ.get('GUNICORN_USER', 'root')
 group = os.environ.get('GUNICORN_GROUP', 'root')
+timeout = os.environ.get('GUNICORN_TIMEOUT', 30)
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,14 @@
+ralph (20190201.1) bionic; urgency=medium
+
+  [ Roman Prykhodchenko ]
+  * Switch to the new deb repository
+  * Allow to parametrize Gunicorn timeout (#3402)
+
+  [ Szymon Jasinski ]
+  * keep db settings on upgrade (#3399)
+
+ -- Roman Prykhodchenko <me@romcheg.me>  Fri, 01 Feb 2019 17:04:39 +0000
+
 ralph (20190124.2) bionic; urgency=medium
 
   [ Roman Prykhodchenko ]