Merge branch '2.4' of https://github.com/MISP/MISP into opendata

.travis.yml

@@ -76,6 +76,7 @@ install:
     - sudo cp travis/database.php app/Config/database.php
     - sudo cp app/Config/core.default.php app/Config/core.php
     - sudo cp app/Config/config.default.php app/Config/config.php
+    - sudo cp travis/email.php app/Config/email.php
     # Ensure the perms
     - sudo chown -R $USER:www-data `pwd`/app/Config
     - sudo chmod -R 770 `pwd`/app/Config
@@ -107,6 +108,8 @@ install:
     - sudo -E su $USER -c 'app/Console/cake Admin setSetting "MISP.redis_port" 6379'
     - sudo -E su $USER -c 'app/Console/cake Admin setSetting "MISP.redis_database" 13'
     - sudo -E su $USER -c 'app/Console/cake Admin setSetting "MISP.redis_password" ""'
+    - sudo -E su $USER -c 'app/Console/cake Admin setSetting "GnuPG.homedir" "`pwd`/.gnupg"'
+    - sudo -E su $USER -c 'app/Console/cake Admin setSetting "GnuPG.password" "travistest"'
     - sudo -E su $USER -c 'app/Console/cake Admin updateGalaxies'
     - sudo -E su $USER -c 'app/Console/cake Admin updateTaxonomies'
     - sudo -E su $USER -c 'app/Console/cake Admin updateWarningLists'

app/files/misp-galaxy

@@ -1 +1 @@
-Subproject commit cb9bff18e8c94584588ec1333affb4959cdc08d0
+Subproject commit 881a5664acfbb0e3ef68c70b641a966859ed2f4f

travis/email.php

@@ -0,0 +1,6 @@
+<?php
+class EmailConfig {
+    public $default = array(
+		'transport' => 'Debug',
+    );
+}