mirror of https://github.com/MISP/MISP
Merge branch '2.4' into develop
commit
b2343fc95d
|
@ -2890,7 +2890,7 @@ mispmodulesRHEL () {
|
||||||
# some misp-modules dependencies for RHEL<8
|
# some misp-modules dependencies for RHEL<8
|
||||||
([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[7].* ]]) && sudo dnf install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel -y
|
([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[7].* ]]) && sudo dnf install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel -y
|
||||||
# some misp-modules dependencies for RHEL8
|
# some misp-modules dependencies for RHEL8
|
||||||
[[ "${DIST_VER}" =~ ^[8].* ]] && sudo dnf install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm -y && sudo dnf install zbar-devel opencv-devel -y
|
[[ "${DIST_VER}" =~ ^[8].* ]] && sudo dnf install https://packages.endpointdev.com/rhel/8/os/x86_64/endpoint-repo.x86_64.rpm -y && sudo dnf install zbar-devel opencv-devel -y
|
||||||
|
|
||||||
echo "[Unit]
|
echo "[Unit]
|
||||||
Description=MISP modules
|
Description=MISP modules
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
; Generated by RHash v1.4.2 on 2021-12-17 at 11:06.13
|
; Generated by RHash v1.4.2 on 2021-12-18 at 01:30.15
|
||||||
; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
|
; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
|
||||||
;
|
;
|
||||||
; 160585 11:06.13 2021-12-17 INSTALL.sh
|
; 160585 01:30.15 2021-12-18 INSTALL.sh
|
||||||
INSTALL.sh AEC401C355C029DED1D86AA99CE2C23C543D9893 B00DFDC930635FBA8A7A289C1F5BA8AB1B70A30E6A6277296CC3DD36E74BD713 3AE99154519041006BD732544445F9BA2485C1AF763D2F909B6C63F1688392B2E0F31A437A292791251D6AED684B3187 454634410F8CB5F357F096F1D0B1E068BFBA6C5663557AAE6C91015E406C9DE3FE878B07FB9FBED0A5866C0E65B4BA0892197812DDF773B33AA2EE68FDC3370A
|
INSTALL.sh 18DA41F22A86C34CA135D6F7FF69B44B23D5B475 77534A9D7755C4DD60EA7F2C9656BD768F0AD209E715C6A45DE6CB20D944A632 81D2D58F49994D1ADC266465E58B50C65F04F655D8A2DB26DA9FCB6A0150C087BB4AED121E92472A6C6443979EFFEE4E B9CF4D11AA70D13B7542D9CE63E8B2DC5A3AEB3F652B873516749442195772F665ADC167831525E38911F6668A075A7136DF3DCDAD5123E75C5FFA03F1366950
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
aec401c355c029ded1d86aa99ce2c23c543d9893 INSTALL.sh
|
18da41f22a86c34ca135d6f7ff69b44b23d5b475 INSTALL.sh
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
b00dfdc930635fba8a7a289c1f5ba8ab1b70a30e6a6277296cc3dd36e74bd713 INSTALL.sh
|
77534a9d7755c4dd60ea7f2c9656bd768f0ad209e715c6a45de6cb20d944a632 INSTALL.sh
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
3ae99154519041006bd732544445f9ba2485c1af763d2f909b6c63f1688392b2e0f31a437a292791251d6aed684b3187 INSTALL.sh
|
81d2d58f49994d1adc266465e58b50c65f04f655d8a2db26da9fcb6a0150c087bb4aed121e92472a6c6443979effee4e INSTALL.sh
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
454634410f8cb5f357f096f1d0b1e068bfba6c5663557aae6c91015e406c9de3fe878b07fb9fbed0a5866c0e65b4ba0892197812ddf773b33aa2ee68fdc3370a INSTALL.sh
|
b9cf4d11aa70d13b7542d9ce63e8b2dc5a3aeb3f652b873516749442195772f665adc167831525e38911f6668a075a7136df3dcdad5123e75c5ffa03f1366950 INSTALL.sh
|
||||||
|
|
|
@ -167,7 +167,7 @@ class JobsController extends AppController
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function __getJobStatus(?string $id): string
|
private function __getJobStatus($id): string
|
||||||
{
|
{
|
||||||
if (!Configure::read('SimpleBackgroundJobs.enabled')) {
|
if (!Configure::read('SimpleBackgroundJobs.enabled')) {
|
||||||
return $this->__jobStatusConverter(CakeResque::getJobStatus($id));
|
return $this->__jobStatusConverter(CakeResque::getJobStatus($id));
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit aeb57194485cb9fa8483b6bc21308d44e921ff75
|
Subproject commit 18a44d372b570a6c274dac018aebfecb2e19ad2f
|
|
@ -21,7 +21,7 @@ mispmodulesRHEL () {
|
||||||
# some misp-modules dependencies for RHEL<8
|
# some misp-modules dependencies for RHEL<8
|
||||||
([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[7].* ]]) && sudo dnf install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel -y
|
([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[7].* ]]) && sudo dnf install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel -y
|
||||||
# some misp-modules dependencies for RHEL8
|
# some misp-modules dependencies for RHEL8
|
||||||
[[ "${DIST_VER}" =~ ^[8].* ]] && sudo dnf install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm -y && sudo dnf install zbar-devel opencv-devel -y
|
[[ "${DIST_VER}" =~ ^[8].* ]] && sudo dnf install https://packages.endpointdev.com/rhel/8/os/x86_64/endpoint-repo.x86_64.rpm -y && sudo dnf install zbar-devel opencv-devel -y
|
||||||
|
|
||||||
echo "[Unit]
|
echo "[Unit]
|
||||||
Description=MISP modules
|
Description=MISP modules
|
||||||
|
|
Loading…
Reference in New Issue