Merge branch 'mw-1.26'

5 files changed, 268 insertions, 0 deletions

diff --git a/vendor/ruflin/elastica/env/elasticsearch/Dockerfile b/vendor/ruflin/elastica/env/elasticsearch/Dockerfile
new file mode 100644
index 00000000..ae2665a0
--- /dev/null
+++ b/vendor/ruflin/elastica/env/elasticsearch/Dockerfile
@@ -0,0 +1,26 @@
+FROM elasticsearch:1.6.0
+MAINTAINER Nicolas Ruflin <spam@ruflin.com>
+
+# Dependencies
+ENV ES_MAPPER_ATTACHMENTS_VER 2.6.0
+ENV ES_TRANSPORT_MEMCACHED_VER 2.6.0
+ENV ES_TRANSPORT_THRIFT_VER 2.6.0
+ENV ES_GEOCLUSTER_FACET_VER 0.0.12
+ENV ES_IMAGE_PLUGIN_VER 1.4.0
+ENV ES_PLUGIN_BIN /usr/share/elasticsearch/bin/plugin
+
+# Install Plugins
+RUN ${ES_PLUGIN_BIN} -install elasticsearch/elasticsearch-mapper-attachments/${ES_MAPPER_ATTACHMENTS_VER}
+RUN ${ES_PLUGIN_BIN} -install image --url https://github.com/SibaTokyo/elasticsearch-image/releases/download/${ES_IMAGE_PLUGIN_VER}/elasticsearch-image-${ES_IMAGE_PLUGIN_VER}.zip
+RUN ${ES_PLUGIN_BIN} -install geocluster-facet --url https://github.com/zenobase/geocluster-facet/releases/download/${ES_GEOCLUSTER_FACET_VER}/geocluster-facet-${ES_GEOCLUSTER_FACET_VER}.jar
+RUN ${ES_PLUGIN_BIN} -install elasticsearch/elasticsearch-transport-thrift/${ES_TRANSPORT_THRIFT_VER}
+RUN ${ES_PLUGIN_BIN} -install elasticsearch/elasticsearch-transport-memcached/${ES_TRANSPORT_MEMCACHED_VER}
+
+# Debug interface
+RUN ${ES_PLUGIN_BIN} -install mobz/elasticsearch-head
+
+# Copy config files
+COPY *.yml /usr/share/elasticsearch/config/
+
+# Expose standard ports, thrift, udp, memcache
+EXPOSE 9200 9300 9500 9700 9800 11211
diff --git a/vendor/ruflin/elastica/env/elasticsearch/elasticsearch.yml b/vendor/ruflin/elastica/env/elasticsearch/elasticsearch.yml
new file mode 100644
index 00000000..bd0368da
--- /dev/null
+++ b/vendor/ruflin/elastica/env/elasticsearch/elasticsearch.yml
@@ -0,0 +1,39 @@
+
+index.number_of_shards: 2
+index.number_of_replicas: 0
+
+# Dont write data to hdd in tests
+index.store.type: memory
+
+# Required plugins
+plugin.mandatory: mapper-attachments, geocluster-facet, transport-thrift, transport-memcached, image
+
+# For bulk tests
+bulk.udp.enabled: true
+bulk.udp.bulk_actions: 5
+
+# For script tests
+script.inline: on
+script.indexed: on
+
+# Disable dynamic memory allocation
+bootstrap.mlockall: true
+
+# Dont accept connections not from localhost
+#network.host: "127.0.0.1"
+
+# Limit threadpool by set number of available processors to 1
+# Without this, travis builds will be failed with OutOfMemory error
+processors: 1
+
+# All nodes will be called Elastica
+node.name: Elastica
+
+# Ports config
+http.port: 9200
+transport.tcp.port: 9300
+thrift.port: 9500
+memcached.port: 11211
+
+# Added for snapshot tests
+path.repo: ["/tmp/test_register", "/tmp/test_repository"]
\ No newline at end of file
diff --git a/vendor/ruflin/elastica/env/elasticsearch/logging.yml b/vendor/ruflin/elastica/env/elasticsearch/logging.yml
new file mode 100644
index 00000000..9e00d01c
--- /dev/null
+++ b/vendor/ruflin/elastica/env/elasticsearch/logging.yml
@@ -0,0 +1,56 @@
+# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
+es.logger.level: INFO
+rootLogger: ${es.logger.level}, console, file
+logger:
+  # log action execution errors for easier debugging
+  action: DEBUG
+  # reduce the logging for aws, too much is logged under the default INFO
+  com.amazonaws: WARN
+
+  # gateway
+  #gateway: DEBUG
+  #index.gateway: DEBUG
+
+  # peer shard recovery
+  #indices.recovery: DEBUG
+
+  # discovery
+  #discovery: TRACE
+
+  index.search.slowlog: TRACE, index_search_slow_log_file
+  index.indexing.slowlog: TRACE, index_indexing_slow_log_file
+
+additivity:
+  index.search.slowlog: false
+  index.indexing.slowlog: false
+
+appender:
+  console:
+    type: console
+    layout:
+      type: consolePattern
+      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
+
+  file:
+    type: dailyRollingFile
+    file: ${path.logs}/${cluster.name}.log
+    datePattern: "'.'yyyy-MM-dd"
+    layout:
+      type: pattern
+      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
+
+  index_search_slow_log_file:
+    type: dailyRollingFile
+    file: ${path.logs}/${cluster.name}_index_search_slowlog.log
+    datePattern: "'.'yyyy-MM-dd"
+    layout:
+      type: pattern
+      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
+
+  index_indexing_slow_log_file:
+    type: dailyRollingFile
+    file: ${path.logs}/${cluster.name}_index_indexing_slowlog.log
+    datePattern: "'.'yyyy-MM-dd"
+    layout:
+      type: pattern
+      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
diff --git a/vendor/ruflin/elastica/env/nginx/mime.types b/vendor/ruflin/elastica/env/nginx/mime.types
new file mode 100644
index 00000000..6c64bf73
--- /dev/null
+++ b/vendor/ruflin/elastica/env/nginx/mime.types
@@ -0,0 +1,109 @@
+types {
+
+# Audio
+  audio/midi                            mid midi kar;
+  audio/mp4                             aac f4a f4b m4a;
+  audio/mpeg                            mp3;
+  audio/ogg                             oga ogg opus;
+  audio/x-realaudio                     ra;
+  audio/x-wav                           wav;
+
+# Images
+  image/bmp                             bmp;
+  image/gif                             gif;
+  image/jpeg                            jpeg jpg;
+  image/png                             png;
+  image/svg+xml                         svg svgz;
+  image/tiff                            tif tiff;
+  image/vnd.wap.wbmp                    wbmp;
+  image/webp                            webp;
+  image/x-icon                          ico cur;
+  image/x-jng                           jng;
+
+# JavaScript
+  application/javascript                js;
+  application/json                      json;
+
+# Manifest files
+  application/x-web-app-manifest+json   webapp;
+  text/cache-manifest                   manifest appcache;
+
+# Microsoft Office
+  application/msword                                                         doc;
+  application/vnd.ms-excel                                                   xls;
+  application/vnd.ms-powerpoint                                              ppt;
+  application/vnd.openxmlformats-officedocument.wordprocessingml.document    docx;
+  application/vnd.openxmlformats-officedocument.spreadsheetml.sheet          xlsx;
+  application/vnd.openxmlformats-officedocument.presentationml.presentation  pptx;
+
+# Video
+  video/3gpp                            3gpp 3gp;
+  video/mp4                             mp4 m4v f4v f4p;
+  video/mpeg                            mpeg mpg;
+  video/ogg                             ogv;
+  video/quicktime                       mov;
+  video/webm                            webm;
+  video/x-flv                           flv;
+  video/x-mng                           mng;
+  video/x-ms-asf                        asx asf;
+  video/x-ms-wmv                        wmv;
+  video/x-msvideo                       avi;
+
+# Web feeds
+  application/xml                       atom rdf rss xml;
+
+# Web fonts
+  application/font-woff                 woff;
+  application/font-woff2                woff2;
+  application/vnd.ms-fontobject         eot;
+  application/x-font-ttf                ttc ttf;
+  font/opentype                         otf;
+
+# Other
+  application/java-archive              jar war ear;
+  application/mac-binhex40              hqx;
+  application/pdf                       pdf;
+  application/postscript                ps eps ai;
+  application/rtf                       rtf;
+  application/vnd.wap.wmlc              wmlc;
+  application/xhtml+xml                 xhtml;
+  application/vnd.google-earth.kml+xml  kml;
+  application/vnd.google-earth.kmz      kmz;
+  application/x-7z-compressed           7z;
+  application/x-chrome-extension        crx;
+  application/x-opera-extension         oex;
+  application/x-xpinstall               xpi;
+  application/x-cocoa                   cco;
+  application/x-java-archive-diff       jardiff;
+  application/x-java-jnlp-file          jnlp;
+  application/x-makeself                run;
+  application/x-perl                    pl pm;
+  application/x-pilot                   prc pdb;
+  application/x-rar-compressed          rar;
+  application/x-redhat-package-manager  rpm;
+  application/x-sea                     sea;
+  application/x-shockwave-flash         swf;
+  application/x-stuffit                 sit;
+  application/x-tcl                     tcl tk;
+  application/x-x509-ca-cert            der pem crt;
+  application/x-bittorrent              torrent;
+  application/zip                       zip;
+
+  application/octet-stream              bin exe dll;
+  application/octet-stream              deb;
+  application/octet-stream              dmg;
+  application/octet-stream              iso img;
+  application/octet-stream              msi msp msm;
+  application/octet-stream              safariextz;
+
+  text/css                              css;
+  text/html                             html htm shtml;
+  text/mathml                           mml;
+  text/plain                            txt;
+  text/vnd.sun.j2me.app-descriptor      jad;
+  text/vnd.wap.wml                      wml;
+  text/vtt                              vtt;
+  text/x-component                      htc;
+  text/x-vcard                          vcf;
+
+}
diff --git a/vendor/ruflin/elastica/env/nginx/nginx.conf b/vendor/ruflin/elastica/env/nginx/nginx.conf
new file mode 100644
index 00000000..edf177d3
--- /dev/null
+++ b/vendor/ruflin/elastica/env/nginx/nginx.conf
@@ -0,0 +1,38 @@
+
+worker_processes 1;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+    charset_types text/xml text/plain text/vnd.wap.wml application/x-javascript application/rss+xml text/css application/javascript application/json;
+
+    server {
+        listen 80;
+
+        #root {{ ES_PROJECT_ROOT }};
+
+        location / {
+            autoindex on;
+        }
+    }
+
+    server {
+        listen 12345;
+
+        location / {
+            proxy_pass http://elasticsearch:9200;
+        }
+    }
+
+    server {
+        listen 12346;
+
+        location / {
+            return 403;
+        }
+    }
+}