From 892a4526f0e653b42f5620d23d4fbec5da148ac9 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 18 Apr 2019 13:24:59 +0900
Subject: [PATCH] chg: [tools] Updated installer after doc update

---
 INSTALL/INSTALL.sh        | 48 +++++++++++++++++----------------------
 INSTALL/INSTALL.sh.sha1   |  2 +-
 INSTALL/INSTALL.sh.sha256 |  2 +-
 INSTALL/INSTALL.sh.sha384 |  2 +-
 INSTALL/INSTALL.sh.sha512 |  2 +-
 5 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh
index 8fdc4140d..981195735 100755
--- a/INSTALL/INSTALL.sh
+++ b/INSTALL/INSTALL.sh
@@ -1196,10 +1196,6 @@ coreCAKE () {
   $SUDO_WWW $CAKE Admin setSetting "Plugin.Cortex_services_port" 9000
   $SUDO_WWW $CAKE Admin setSetting "Plugin.Cortex_timeout" 120
   $SUDO_WWW $CAKE Admin setSetting "Plugin.Cortex_authkey" ""
-  # Mysteriously removed?
-  #$SUDO_WWW $CAKE Admin setSetting "Plugin.Cortex_services_timeout" 120
-  # Mysteriously removed?
-  #$SUDO_WWW $CAKE Admin setSetting "Plugin.Cortex_services_authkey" ""
   $SUDO_WWW $CAKE Admin setSetting "Plugin.Cortex_ssl_verify_peer" false
   $SUDO_WWW $CAKE Admin setSetting "Plugin.Cortex_ssl_verify_host" false
   $SUDO_WWW $CAKE Admin setSetting "Plugin.Cortex_ssl_allow_self_signed" true
@@ -1272,18 +1268,15 @@ updateGOWNT () {
 
   # Update the galaxies…
   # TODO: Fix updateGalaxies
-  ##$SUDO_WWW $CAKE Admin updateGalaxies
-  curl --header "Authorization: $AUTH_KEY" --header "Accept: application/json" --header "Content-Type: application/json" -k -X POST https://127.0.0.1/galaxies/update
+  $SUDO_WWW $CAKE Admin updateGalaxies
   # Updating the taxonomies…
   $SUDO_WWW $CAKE Admin updateTaxonomies
   # Updating the warning lists…
-  # TODO: Fix updateWarningLists
-  ##$SUDO_WWW $CAKE Admin updateWarningLists
-  curl --header "Authorization: $AUTH_KEY" --header "Accept: application/json" --header "Content-Type: application/json" -k -X POST https://127.0.0.1/warninglists/update
+  $SUDO_WWW $CAKE Admin updateWarningLists
   # Updating the notice lists…
-  ## $SUDO_WWW $CAKE Admin updateNoticeLists
-  curl --header "Authorization: $AUTH_KEY" --header "Accept: application/json" --header "Content-Type: application/json" -k -X POST https://127.0.0.1/noticelists/update
+  $SUDO_WWW $CAKE Admin updateNoticeLists
   # Updating the object templates…
+  # TODO: FIXME: updateObjectTemplates (currently throws: usage udpateNoticeLists)
   ##$SUDO_WWW $CAKE Admin updateObjectTemplates
   curl --header "Authorization: $AUTH_KEY" --header "Accept: application/json" --header "Content-Type: application/json" -k -X POST https://127.0.0.1/objectTemplates/update
 }
@@ -1470,22 +1463,22 @@ mispDashboard () {
 
 dashboardCAKE () {
   # Enable ZeroMQ for misp-dashboard
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_enable" true
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_event_notifications_enable" true
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_object_notifications_enable" true
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_object_reference_notifications_enable" true
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_attribute_notifications_enable" true
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_sighting_notifications_enable" true
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_user_notifications_enable" true
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_organisation_notifications_enable" true
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_port" 50000
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_redis_host" "localhost"
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_redis_port" 6379
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_redis_database" 1
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_redis_namespace" "mispq"
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_include_attachments" false
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_tag_notifications_enable" false
-  sudo -H -u www-data $CAKE Admin setSetting "Plugin.ZeroMQ_audit_notifications_enable" false
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_enable" true
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_event_notifications_enable" true
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_object_notifications_enable" true
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_object_reference_notifications_enable" true
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_attribute_notifications_enable" true
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_sighting_notifications_enable" true
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_user_notifications_enable" true
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_organisation_notifications_enable" true
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_port" 50000
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_redis_host" "localhost"
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_redis_port" 6379
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_redis_database" 1
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_redis_namespace" "mispq"
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_include_attachments" false
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_tag_notifications_enable" false
+  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_audit_notifications_enable" false
 }
 
 # Main mail2misp install function
@@ -1529,6 +1522,7 @@ ssdeep () {
   sudo make install
 
   #installing ssdeep_php
+  sudo pecl channel-update pecl.php.net
   sudo pecl install ssdeep
 
   # You should add "extension=ssdeep.so" to mods-available - Check /etc/php for your current version
diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1
index ac8f58371..dc1fb6f1d 100644
--- a/INSTALL/INSTALL.sh.sha1
+++ b/INSTALL/INSTALL.sh.sha1
@@ -1 +1 @@
-fdccbb3265316297a1cf4ff9f054ac4c242f725a  INSTALL.sh
+42fa13c166224e2cefca3aca82d5860a8a7e21fc  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256
index be5c321b8..33eca3bff 100644
--- a/INSTALL/INSTALL.sh.sha256
+++ b/INSTALL/INSTALL.sh.sha256
@@ -1 +1 @@
-860cc67ab62379f72a2ea04cfcbbacb2347ea6be4a8963efb0c4de846f273d78  INSTALL.sh
+04ab69f42b1ffa62955caa34ba0b0719def56f290df804016e1739e6942be05d  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384
index 8009b83e6..c16d77130 100644
--- a/INSTALL/INSTALL.sh.sha384
+++ b/INSTALL/INSTALL.sh.sha384
@@ -1 +1 @@
-b629f3f04c32b9659d9025c5fce43cde809c6f122e38c8f30e13842e371459e985dad826746323fffeec022ce4d13da8  INSTALL.sh
+8ca42cb7c876007257058e0f2e35712e54ba9a5787b2406a2030a19cb238bd92e90ca405029a7ae3d7184d13da861975  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512
index b34a4c199..9a40217d4 100644
--- a/INSTALL/INSTALL.sh.sha512
+++ b/INSTALL/INSTALL.sh.sha512
@@ -1 +1 @@
-bd651ba5614bfcd3487e600c69272c8ddfcc7836a7884e1e998dfff205e5f3c83ed257b896fcdff8af1a7b0973be269cf6d880167f6d1e24b3a139369961d9a3  INSTALL.sh
+b9ddf51f323409f53c8568fc65f75740558a5cd30a5700cdd8d8dce583eb69b346b2c4d2074e5660319bd4e4cd816d768bf0c94812b2c9f7a6d514f580d65f42  INSTALL.sh