Merge branch 'develop' of http://github.com/WikiToLearn/WikiToLearn i…

…nto develop This will integrate WikiMedia's Math extension instead of WikiToLearn's branch.
WikiToLearn · Jan 16, 2016 · 8e773e4 · 8e773e4
2 parents 82946a7 + a136d7f
commit 8e773e4
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 59 deletions.
diff --git a/Dockers/create_instance_config.sh b/Dockers/create_instance_config.sh
@@ -20,13 +20,7 @@ if [[ ! -f instance_config.conf ]] ; then
   [[ -z "$W2L_SKIP_OCG_DOCKER" ]] && W2L_SKIP_OCG_DOCKER="0"
   echo "export W2L_SKIP_OCG_DOCKER=$W2L_SKIP_OCG_DOCKER"
 
-  echo "export W2L_DOCKER_MYSQL=mysql:5.6"
-  echo "export W2L_DOCKER_MEMCACHED=memcached:1.4.24"
-  echo "export W2L_DOCKER_OCG=wikitolearn/ocg:0.8"
-  echo "export W2L_DOCKER_WEBSRV=wikitolearn/websrv:0.11"
-  echo "export W2L_DOCKER_HAPROXY=wikitolearn/haproxy:0.6"
-  echo "export W2L_DOCKER_PARSOID=wikitolearn/parsoid:0.1"
-  echo "export W2L_DOCKER_MATHOID=wikitolearn/mathoid:0.1"
+  echo ". ../docker-images.conf"
  } > instance_config.conf
  echo
  echo "Created default instance_config.conf file"

diff --git a/Dockers/dev-instance-existing-data.sh b/Dockers/dev-instance-existing-data.sh
@@ -5,3 +5,4 @@ export W2L_PRODUCTION=0
 ./use-instance.sh
 sleep 1
 ./fix-hosts.sh
+./fix-hosts-tuttorotto.biz.sh
diff --git a/Dockers/dev-instance.sh b/Dockers/dev-instance.sh
@@ -23,3 +23,5 @@ sleep 1
 ./fix-hosts.sh
 export W2L_INIT_DB=1
 ./init-docker.sh
+#fix ocg service binding
+./fix-hosts-tuttorotto.biz.sh
diff --git a/Dockers/fix-hosts-tuttorotto.biz.sh b/Dockers/fix-hosts-tuttorotto.biz.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+cd "$(dirname "$(readlink "$0" || printf %s "$0")")"
+
+if [[ ! -f ./instance_config.conf ]] ; then
+ echo "Missing ./instance_config.conf file"
+ exit 1
+fi
+
+. ./instance_config.conf
+
+if [[ "$W2L_INSTANCE_NAME" == "" ]] ; then
+ echo "Missing key env variabile W2L_INSTANCE_NAME"
+ exit 1
+fi
+
+WEBSRV_IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" ${W2L_INSTANCE_NAME}-websrv)
+OCG_IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" ${W2L_INSTANCE_NAME}-ocg)
+
+for docker in ${W2L_INSTANCE_NAME}-websrv ${W2L_INSTANCE_NAME}-ocg ; do
+ web_hosts=$(for subdom in $(find ../secrets/ -name *wikitolearn.php -exec basename {} \; | sed 's/wikitolearn.php//g'); do
+  echo ${subdom}".tuttorotto.biz "
+ done)
+ echo $web_Whosts" to "$WEBSRV_IP
+ {
+  docker exec $docker sed '/HOSTTUTTOROTTOBIZFIX1/d' /etc/hosts | docker exec -i $docker tee /tmp/tmp_hosts
+  docker exec $docker cat /tmp/tmp_hosts | docker exec -i $docker tee /etc/hosts
+  echo $WEBSRV_IP" HOSTTUTTOROTTOBIZFIX1 "$web_hosts | docker exec -i $docker tee -a /etc/hosts
+ } &> /dev/null
+
+ ocg_hosts=$(for ocg_host in ocg ocg.tuttorotto.biz ; do
+  echo $ocg_host" "
+ done)
+ echo "Fixing "$ocg_hosts" to "$OCG_IP
+ {
+  docker exec $docker sed '/HOSTTUTTOROTTOBIZFIX2/d' /etc/hosts | docker exec -i $docker tee /tmp/tmp_hosts
+  docker exec $docker cat /tmp/tmp_hosts | docker exec -i $docker tee /etc/hosts
+  echo $OCG_IP" HOSTTUTTOROTTOBIZFIX2 "$ocg_hosts | docker exec -i $docker tee -a /etc/hosts
+ } &> /dev/null
+
+done
diff --git a/Dockers/ocg-dev/build.sh b/Dockers/ocg-dev/build.sh
@@ -34,4 +34,6 @@ docker run -ti --hostname ocg.wikitolearn.org --name ${W2L_INSTANCE_NAME}-ocg -d
 
 cd ..
 ./fix-hosts.sh
+#fix ocg service local binding
+./fix-hosts-tuttorotto.biz.sh
 exit 0
diff --git a/Dockers/ocg-dev/mw-ocg-latexer b/Dockers/ocg-dev/mw-ocg-latexer
diff --git a/LocalSettings.php b/LocalSettings.php
@@ -379,6 +379,8 @@ function efMWNoTOC($parser) {
 );
 
 $wgCollectionRendererSettings['columns']['default'] = 1;
+$wgCollectionRendererSettings['footerLeft']['default'] = 'WikiToLearn.org';
+$wgCollectionRendererSettings['footerMiddle']['default'] = 'Il sapere si accresce solo se condiviso';
 
 $wgLicenseURL = "//creativecommons.org/licenses/by-sa/3.0/";
 $wgCollectionPortletFormats = array('rdf2latex', 'rdf2text');

diff --git a/docker-images.conf b/docker-images.conf
@@ -0,0 +1,8 @@
+#!/bin/bash
+export W2L_DOCKER_MYSQL="mysql:5.6"
+export W2L_DOCKER_MEMCACHED="memcached:1.4.24"
+export W2L_DOCKER_OCG="wikitolearn/ocg:0.8"
+export W2L_DOCKER_WEBSRV="wikitolearn/websrv:0.11"
+export W2L_DOCKER_HAPROXY="wikitolearn/haproxy:0.6"
+export W2L_DOCKER_PARSOID="wikitolearn/parsoid:0.1"
+export W2L_DOCKER_MATHOID="wikitolearn/mathoid:0.1"
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
@@ -147,7 +147,7 @@ public function add($prefix, $paths, $prepend = false)
      * appending or prepending to the ones previously set for this namespace.
      *
      * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-0 base directories
+     * @param array|string $paths   The PSR-4 base directories
      * @param bool         $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -1107,57 +1107,6 @@
             "tokenizer"
         ]
     },
-    {
-        "name": "symfony/yaml",
-        "version": "v2.8.1",
-        "version_normalized": "2.8.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/yaml.git",
-            "reference": "ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/yaml/zipball/ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966",
-            "reference": "ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "time": "2015-12-26 13:37:56",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Yaml\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Yaml Component",
-        "homepage": "https://symfony.com"
-    },
     {
         "name": "phpunit/php-text-template",
         "version": "1.2.1",
@@ -1550,5 +1499,56 @@
         "keywords": [
             "serialization"
         ]
+    },
+    {
+        "name": "symfony/yaml",
+        "version": "v2.8.1",
+        "version_normalized": "2.8.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/yaml.git",
+            "reference": "ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/yaml/zipball/ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966",
+            "reference": "ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "time": "2015-12-26 13:37:56",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Yaml\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Yaml Component",
+        "homepage": "https://symfony.com"
     }
 ]