From 80f7dc77d430774192b929d780f96260066df2ee Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 18 Oct 2015 09:31:31 +0200
Subject: Update to MediaWiki 1.25.3

---
 .../elastica/test/bin/install_php_memcache.sh      |  8 ----
 .../ruflin/elastica/test/bin/run_elasticsearch.sh  | 56 ----------------------
 vendor/ruflin/elastica/test/bin/run_proxy.sh       | 15 ------
 vendor/ruflin/elastica/test/bin/show_logs.sh       |  3 --
 4 files changed, 82 deletions(-)
 delete mode 100644 vendor/ruflin/elastica/test/bin/install_php_memcache.sh
 delete mode 100644 vendor/ruflin/elastica/test/bin/run_elasticsearch.sh
 delete mode 100644 vendor/ruflin/elastica/test/bin/run_proxy.sh
 delete mode 100644 vendor/ruflin/elastica/test/bin/show_logs.sh

(limited to 'vendor/ruflin/elastica/test/bin')

diff --git a/vendor/ruflin/elastica/test/bin/install_php_memcache.sh b/vendor/ruflin/elastica/test/bin/install_php_memcache.sh
deleted file mode 100644
index dd046a56..00000000
--- a/vendor/ruflin/elastica/test/bin/install_php_memcache.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Build and install PHP Memcache extension
-wget http://pecl.php.net/get/memcache-${MEMCACHE_VER}.tgz
-tar -xzf memcache-${MEMCACHE_VER}.tgz
-sh -c "cd memcache-${MEMCACHE_VER} && phpize && ./configure --enable-memcache && make && sudo make install"
-echo "extension=memcache.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
-
diff --git a/vendor/ruflin/elastica/test/bin/run_elasticsearch.sh b/vendor/ruflin/elastica/test/bin/run_elasticsearch.sh
deleted file mode 100644
index ddbbef35..00000000
--- a/vendor/ruflin/elastica/test/bin/run_elasticsearch.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-check_port_http_code() {
-    http_code=`echo $(curl -s -o /dev/null -w "%{http_code}" "http://localhost:$1")`
-    return `test $http_code = "$2"`
-}
-
-wget http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${ES_VER}.tar.gz
-tar -xzf elasticsearch-${ES_VER}.tar.gz
-
-elasticsearch-${ES_VER}/bin/plugin -install elasticsearch/elasticsearch-mapper-attachments/${ES_MAPPER_ATTACHMENTS_VER}
-#elasticsearch-${ES_VER}/bin/plugin -install elasticsearch/elasticsearch-transport-thrift/${ES_TRANSPORT_THRIFT_VER}
-elasticsearch-${ES_VER}/bin/plugin -install geocluster-facet --url https://github.com/zenobase/geocluster-facet/releases/download/${ES_GEOCLUSTER_FACET_VER}/geocluster-facet-${ES_GEOCLUSTER_FACET_VER}.jar
-
-export JAVA_OPTS="-server"
-
-# start 3 elasticsearch instances
-for i in 0 1 2
-do
-    echo "Setup node #$i"
-
-    let "http_port = 9200 + $i"
-    let "thrift_port = 9500 + $i"
-
-    config_yml=elasticsearch-${ES_VER}/config/elasticsearch-$http_port.yml
-
-    echo "Creating config $config_yml"
-
-    cp elasticsearch-${ES_VER}/config/elasticsearch.yml $config_yml
-
-    echo "index.number_of_shards: 2" >> $config_yml
-    echo "index.number_of_replicas: 0" >> $config_yml
-    echo "discovery.zen.ping.multicast.enabled: false" >> $config_yml
-    echo "http.port: $http_port" >> $config_yml
-    echo "thrift.port: $thrift_port" >> $config_yml
-
-    # enable udp
-    echo "bulk.udp.enabled: true" >> $config_yml
-    echo "bulk.udp.bulk_actions: 5" >> $config_yml
-    
-    # enable dynamic scripting
-    echo "script.disable_dynamic: false" >> $config_yml
-
-    echo "Starting server on http port: $http_port"
-
-    elasticsearch-${ES_VER}/bin/elasticsearch -d -Des.config=$config_yml &
-
-    while ! check_port_http_code $http_port 200; do
-        echo -n "."
-        sleep 2s
-    done
-    echo ""
-    echo "Server #$i is up"
-done
-
-echo "three elasticsearch nodes are up"
diff --git a/vendor/ruflin/elastica/test/bin/run_proxy.sh b/vendor/ruflin/elastica/test/bin/run_proxy.sh
deleted file mode 100644
index c62db8cd..00000000
--- a/vendor/ruflin/elastica/test/bin/run_proxy.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-sudo killall nginx 2>/dev/null
-
-echo "installing nginx"
-
-sudo apt-get install nginx
-
-echo "stopping stock nginx"
-
-/etc/init.d/nginx stop
-
-echo "running nginx"
-
-sudo nginx -p test/nginx/ -c nginx.conf
diff --git a/vendor/ruflin/elastica/test/bin/show_logs.sh b/vendor/ruflin/elastica/test/bin/show_logs.sh
deleted file mode 100644
index 0130d2a5..00000000
--- a/vendor/ruflin/elastica/test/bin/show_logs.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cat elasticsearch-${ES_VER}/logs/*
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf