Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/213516
Change subject: Update web config files
......................................................................
Update web config files
Change-Id: I71d44d640d59bca385504b4a74f9e98ee73c01de
---
M puppet/modules/hhvm/files/php.ini
M puppet/modules/nginx/files/nginx.conf
M puppet/modules/nginx/files/translatewiki.net
M puppet/modules/profile/manifests/mwelasticsearch.pp
4 files changed, 11 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/16/213516/1
diff --git a/puppet/modules/hhvm/files/php.ini
b/puppet/modules/hhvm/files/php.ini
index 53f012f..bf6cf64 100644
--- a/puppet/modules/hhvm/files/php.ini
+++ b/puppet/modules/hhvm/files/php.ini
@@ -14,7 +14,7 @@
hhvm.server.stat_cache = 1
hhvm.admin_server.port = 9001
-hhvm.dynamic_extension_path =
/usr/lib/x86_64-linux-gnu/hhvm/extensions/20140829
+hhvm.dynamic_extension_path =
/usr/lib/x86_64-linux-gnu/hhvm/extensions/20150212
hhvm.dynamic_extensions[*] = ffs.so
hhvm.dynamic_extensions[*] = luasandbox.so
hhvm.dynamic_extensions[*] = wikidiff2.so
@@ -22,9 +22,9 @@
hhvm.perf_pid_map = false
hhvm.jit = true
-hhvm.jit_a_size = 100000000
-hhvm.jit_a_frozen_size = 100000000
-hhvm.jit_a_cold_size = 50000000
+hhvm.jit_a_size = 600000000
+hhvm.jit_a_frozen_size = 200000000
+hhvm.jit_a_cold_size = 200000000
hhvm.log.level = Notice
hhvm.log.always_log_unhandled_exceptions = true
@@ -41,4 +41,5 @@
hhvm.enable_obj_destruct_call = true
hhvm.mysql.typed_results = false
-hhvm.mysql.slow_query_threshold = 5000
+hhvm.mysql.slow_query_threshold = 30000
+hhvm.mysql.connect_timeout = 3000
diff --git a/puppet/modules/nginx/files/nginx.conf
b/puppet/modules/nginx/files/nginx.conf
index d8093a0..f02ecd5 100644
--- a/puppet/modules/nginx/files/nginx.conf
+++ b/puppet/modules/nginx/files/nginx.conf
@@ -50,8 +50,8 @@
##
upstream php {
-# server unix:/run/hhvm/hhvm.sock;
- server unix:/run/php5-fpm.sock;
+ server unix:/run/hhvm/hhvm.sock;
+ server unix:/run/php5-fpm.sock backup;
}
include /etc/nginx/sites-enabled/*;
diff --git a/puppet/modules/nginx/files/translatewiki.net
b/puppet/modules/nginx/files/translatewiki.net
index ff280a0..64945dd 100644
--- a/puppet/modules/nginx/files/translatewiki.net
+++ b/puppet/modules/nginx/files/translatewiki.net
@@ -56,7 +56,8 @@
fastcgi_pass php;
fastcgi_buffering off;
fastcgi_buffers 16 16k;
- fastcgi_send_timeout 5s;
+ fastcgi_connect_timeout 1s;
+ fastcgi_send_timeout 2s;
fastcgi_read_timeout 15s;
include fastcgi.conf;
}
diff --git a/puppet/modules/profile/manifests/mwelasticsearch.pp
b/puppet/modules/profile/manifests/mwelasticsearch.pp
index 9a96380..c0316e1 100644
--- a/puppet/modules/profile/manifests/mwelasticsearch.pp
+++ b/puppet/modules/profile/manifests/mwelasticsearch.pp
@@ -2,7 +2,7 @@
class { 'elasticsearch':
manage_repo => true,
- repo_version => '1.3',
+ repo_version => '1.5',
config => {
'script.disable_dynamic' => false,
'network.host' => '::1',
--
To view, visit https://gerrit.wikimedia.org/r/213516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71d44d640d59bca385504b4a74f9e98ee73c01de
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
