mirror of https://github.com/MISP/MISP
Merge branch 'hotfix-2.2.40' into develop
commit
cb251c69ab
|
@ -1,4 +1,6 @@
|
||||||
/vendors
|
/vendors
|
||||||
|
/app/Vendor
|
||||||
|
/app/composer*
|
||||||
/lib
|
/lib
|
||||||
/.project
|
/.project
|
||||||
/.settings
|
/.settings
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
[submodule "app/Plugin/CakeResque"]
|
|
||||||
path = app/Plugin/CakeResque
|
|
||||||
url = https://github.com/kamisama/Cake-Resque.git
|
|
||||||
[submodule "app/Lib/cakephp"]
|
[submodule "app/Lib/cakephp"]
|
||||||
path = app/Lib/cakephp
|
path = app/Lib/cakephp
|
||||||
url = https://github.com/cakephp/cakephp.git
|
url = https://github.com/cakephp/cakephp.git
|
||||||
|
|
|
@ -36,8 +36,10 @@ git config core.filemode false
|
||||||
cd "$MISP_PATH"
|
cd "$MISP_PATH"
|
||||||
git submodule init
|
git submodule init
|
||||||
git submodule update
|
git submodule update
|
||||||
cd "$MISP_PATH/app/Plugin/CakeResque"
|
cd "$MISP_PATH/app"
|
||||||
curl -s https://getcomposer.org/installer | php
|
curl -s https://getcomposer.org/installer | php
|
||||||
|
php composer.phar require --no-update kamisama/cake-resque:4.1.0
|
||||||
|
php composer.phar config vendor-dir Vendor
|
||||||
php composer.phar install
|
php composer.phar install
|
||||||
cd "$MISP_PATH"
|
cd "$MISP_PATH"
|
||||||
chown -R www-data:www-data "$MISP_PATH"
|
chown -R www-data:www-data "$MISP_PATH"
|
||||||
|
|
|
@ -45,18 +45,28 @@ git clone https://github.com/MISP/MISP.git
|
||||||
cd /var/www/MISP
|
cd /var/www/MISP
|
||||||
git config core.filemode false
|
git config core.filemode false
|
||||||
|
|
||||||
4/ CakePHP (and CakeResque)
|
4/ CakePHP
|
||||||
-----------
|
-----------
|
||||||
# CakePHP is now included as a submodule of MISP, execute the following commands to let git fetch it:
|
# CakePHP is now included as a submodule of MISP, execute the following commands to let git fetch it:
|
||||||
|
|
||||||
git submodule init
|
git submodule init
|
||||||
git submodule update
|
git submodule update
|
||||||
|
|
||||||
# Once done, install the dependencies of CakeResque if you intend to use the built in background jobs:
|
# Once done, install CakeResque along with its dependencies if you intend to use the built in background jobs:
|
||||||
cd /var/www/MISP/app/Plugin/CakeResque
|
cd /var/www/MISP/app
|
||||||
curl -s https://getcomposer.org/installer | php
|
curl -s https://getcomposer.org/installer | php
|
||||||
|
php composer.phar require --no-update kamisama/cake-resque:4.1.0
|
||||||
|
php composer.phar config vendor-dir Vendor
|
||||||
php composer.phar install
|
php composer.phar install
|
||||||
|
|
||||||
|
# Once CakeResque is installed, make sure to enable it by uncommenting the following lines:
|
||||||
|
# in Core.php (if you have just recently updated MISP, just add this line at the end of the file):
|
||||||
|
# require_once dirname(__DIR__) . '/Vendor/autoload.php';
|
||||||
|
|
||||||
|
# in bootstrap.php uncomment the following line (at the end of the file):
|
||||||
|
# CakePlugin::loadAll(array('CakeResque' => array('bootstrap' => true)));
|
||||||
|
# set Configure::write('MISP.background_jobs', false); to Configure::write('MISP.background_jobs', true);
|
||||||
|
|
||||||
# CakeResque normally uses phpredis to connect to redis, but it has a (buggy) fallback connector through Redisent. It is highly advised to install phpredis
|
# CakeResque normally uses phpredis to connect to redis, but it has a (buggy) fallback connector through Redisent. It is highly advised to install phpredis
|
||||||
pecl install redis
|
pecl install redis
|
||||||
# After installing it, enable it in your php.ini file
|
# After installing it, enable it in your php.ini file
|
||||||
|
@ -152,8 +162,7 @@ sudo -u www-data gpg --homedir /var/www/MISP/.gnupg --gen-key
|
||||||
sudo -u www-data gpg --homedir /var/www/MISP/.gnupg --export --armor YOUR-EMAIL > /var/www/MISP/app/webroot/gpg.asc
|
sudo -u www-data gpg --homedir /var/www/MISP/.gnupg --export --armor YOUR-EMAIL > /var/www/MISP/app/webroot/gpg.asc
|
||||||
|
|
||||||
# Start the workers to enable background jobs
|
# Start the workers to enable background jobs
|
||||||
cd /var/www/MISP/app/Console/worker/
|
/var/www/MISP/app/Console/worker/start.sh
|
||||||
./start.sh
|
|
||||||
|
|
||||||
# To make the background workers start on boot
|
# To make the background workers start on boot
|
||||||
chmod +x /var/www/MISP/app/Console/worker/start.sh
|
chmod +x /var/www/MISP/app/Console/worker/start.sh
|
||||||
|
|
|
@ -49,9 +49,13 @@ else
|
||||||
echo "Error, you need either apt-get, yum or brew to install Redis using this script. Please install it manually.";
|
echo "Error, you need either apt-get, yum or brew to install Redis using this script. Please install it manually.";
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd "$MISP_PATH/app/Plugin/CakeResque"
|
cd "$MISP_PATH/app"
|
||||||
|
|
||||||
curl -s https://getcomposer.org/installer | php
|
curl -s https://getcomposer.org/installer | php
|
||||||
|
php composer.phar require --no-update kamisama/cake-resque:4.1.0
|
||||||
|
php composer.phar config vendor-dir Vendor
|
||||||
php composer.phar install
|
php composer.phar install
|
||||||
|
|
||||||
cd "$MISP_PATH"
|
cd "$MISP_PATH"
|
||||||
chown -R www-data:www-data "$MISP_PATH"
|
chown -R www-data:www-data "$MISP_PATH"
|
||||||
chmod -R 750 "$MISP_PATH"
|
chmod -R 750 "$MISP_PATH"
|
||||||
|
|
|
@ -22,6 +22,7 @@ Enabling background jobs via CakeResque
|
||||||
- vim /var/www/MISP/app/Config/bootstrap.php
|
- vim /var/www/MISP/app/Config/bootstrap.php
|
||||||
- set Configure::write('MISP.background_jobs', false); to Configure::write('MISP.background_jobs', true);
|
- set Configure::write('MISP.background_jobs', false); to Configure::write('MISP.background_jobs', true);
|
||||||
- uncomment CakePlugin::load('CakeResque', array('bootstrap' => true));
|
- uncomment CakePlugin::load('CakeResque', array('bootstrap' => true));
|
||||||
|
- in Core.php (if you have just recently updated MISP, just add this line at the end of the file): require_once dirname(__DIR__) . '/Vendor/autoload.php';
|
||||||
|
|
||||||
- start the background workers
|
- start the background workers
|
||||||
- cd /var/www/MISP/app/Console/worker/
|
- cd /var/www/MISP/app/Console/worker/
|
||||||
|
|
|
@ -69,7 +69,8 @@ $config['CakeResque'] = array(
|
||||||
'host' => 'localhost', // Redis server hostname
|
'host' => 'localhost', // Redis server hostname
|
||||||
'port' => 6379, // Redis server port
|
'port' => 6379, // Redis server port
|
||||||
'database' => 0, // Redis database number
|
'database' => 0, // Redis database number
|
||||||
'namespace' => 'resque' // Redis keys namespace
|
'namespace' => 'resque', // Redis keys namespace
|
||||||
|
'password' => null // Redis password
|
||||||
),
|
),
|
||||||
|
|
||||||
'Worker' => array(
|
'Worker' => array(
|
||||||
|
@ -98,7 +99,7 @@ $config['CakeResque'] = array(
|
||||||
//
|
//
|
||||||
// You can also define per-job tracking by passing true/false when calling
|
// You can also define per-job tracking by passing true/false when calling
|
||||||
// CakeResque::enqueue(), CakeResque::enqueueAt() or CakeResque::enqueueIn()
|
// CakeResque::enqueue(), CakeResque::enqueueAt() or CakeResque::enqueueIn()
|
||||||
'track' => true
|
'track' => false
|
||||||
),
|
),
|
||||||
/*
|
/*
|
||||||
'Queues' => array(
|
'Queues' => array(
|
||||||
|
@ -113,16 +114,6 @@ $config['CakeResque'] = array(
|
||||||
)
|
)
|
||||||
*/
|
*/
|
||||||
'Resque' => array(
|
'Resque' => array(
|
||||||
|
|
||||||
// Path to the php-resque library
|
|
||||||
//
|
|
||||||
// Relative or absolute path to the php-resque library
|
|
||||||
// If you are using Composer to install dependencies,
|
|
||||||
// this is the name of the vendor library
|
|
||||||
// Path is relative to the CakeResque/vendor
|
|
||||||
// Don't add trailing slash to path
|
|
||||||
'lib' => 'kamisama/php-resque-ex',
|
|
||||||
|
|
||||||
// Path to the directory containing the worker PID files
|
// Path to the directory containing the worker PID files
|
||||||
'tmpdir' => App::pluginPath('CakeResque') . 'tmp' . DS
|
'tmpdir' => App::pluginPath('CakeResque') . 'tmp' . DS
|
||||||
),
|
),
|
||||||
|
@ -184,8 +175,6 @@ $config['CakeResque'] = array(
|
||||||
// Enable or disable delayed job
|
// Enable or disable delayed job
|
||||||
'enabled' => true,
|
'enabled' => true,
|
||||||
|
|
||||||
// Path to the php-resque-ex-scheduler's library
|
|
||||||
'lib' => 'kamisama/php-resque-ex-scheduler',
|
|
||||||
// Path to the log file
|
// Path to the log file
|
||||||
'log' => TMP . 'logs' . DS . 'resque-scheduler-error.log',
|
'log' => TMP . 'logs' . DS . 'resque-scheduler-error.log',
|
||||||
|
|
||||||
|
@ -207,9 +196,5 @@ $config['CakeResque'] = array(
|
||||||
'handler' => 'RotatingFile',
|
'handler' => 'RotatingFile',
|
||||||
'target' => TMP . 'logs' . DS . 'resque-scheduler.log'
|
'target' => TMP . 'logs' . DS . 'resque-scheduler.log'
|
||||||
)
|
)
|
||||||
),
|
|
||||||
'Status' => array(
|
|
||||||
// Path to the resque-status library
|
|
||||||
'lib' => 'kamisama/resque-status',
|
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
|
@ -277,3 +277,5 @@ Cache::config('_cake_model_', array(
|
||||||
'serialize' => ($engine === 'File'),
|
'serialize' => ($engine === 'File'),
|
||||||
'duration' => $duration
|
'duration' => $duration
|
||||||
));
|
));
|
||||||
|
|
||||||
|
//require_once dirname(__DIR__) . '/Vendor/autoload.php';
|
Loading…
Reference in New Issue