MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Update to the installation instructions (fixes #257) and the 2.2 upgrade script 

- fixed 2 incorrect entries in the installation.txt file

- fixed an incorrect variable name in the 2.2 event upgrade script
pull/274/merge
iglocska 2014-05-06 10:44:53 +02:00
parent 41ee2d73bd
commit 2c72b129a5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL/INSTALL.txt
View File

@ -27,7 +27,7 @@ Once the system is installed you can perform the following steps as root:
apt-get install vim
# Install the dependencies:
apt-get install zip php-pear git redis-server
apt-get install zip php-pear git redis-server make
pear install Crypt_GPG # we need version >1.3.0
pear install Net_GeoIP
@ -63,7 +63,7 @@ vim /etc/php5/apache2/php.ini
extension=redis.so
# To use the scheduler worker for scheduled tasks, do the following:
cp -fa /var/www/MISP/INSTALL/setup/config.php var/www/MISP/app/Plugin/CakeResque/Config/config.php
cp -fa /var/www/MISP/INSTALL/setup/config.php /var/www/MISP/app/Plugin/CakeResque/Config/config.php
5/ Set the permissions
----------------------

4
app/Model/Event.php
View File

@ -1757,10 +1757,10 @@ class Event extends AppModel {
// if the xml contains an event or events from an older MISP instance, let's try to upgrade it!
// Let's manually set the version to something below 2.2.0 if there is no version set in the xml
if (!isset($xmlArray['response']['xmlVersion'])) $xmlArray['response']['xmlVersion'] = '2.1.0';
if (!isset($xmlArray['response']['xml_version'])) $xmlArray['response']['xml_version'] = '2.1.0';
// Upgrade from versions below 2.2.0 will need to replace the risk field with threat level id
if ($this->compareVersions($xmlArray['response']['xmlVersion'], '2.2.0') < 0) {
if ($this->compareVersions($xmlArray['response']['xml_version'], '2.2.0') < 0) {
if ($response) $xmlArray['response'] = $this->__updateXMLArray220($xmlArray['response']);
else $xmlArray = $this->__updateXMLArray220($xmlArray);
}