mirror of https://github.com/MISP/MISP
Merge branch '2.4' of github.com:MISP/MISP into 2.4
iglocska
commit
c54839d2eb
|
|
@ -74,7 +74,19 @@ MISPvars () {
|
|||
MISP_PASSWORD='Password1234'
|
||||
|
||||
# The web server user
|
||||
WWW_USER="www-data"
|
||||
# RHEL/CentOS
|
||||
if [[ -f "/etc/redhat-release" ]]; then
|
||||
WWW_USER='apache'
|
||||
# Debian flavoured
|
||||
elif [[ -f "/etc/debian_version" ]]; then
|
||||
WWW_USER="www-data"
|
||||
# OpenBSD
|
||||
elif [[ "$(uname -s)" == "OpenBSD" ]]; then
|
||||
WWW_USER="www"
|
||||
else
|
||||
# I am feeling lucky
|
||||
WWW_USER="www-data"
|
||||
fi
|
||||
|
||||
# MISP configuration variables
|
||||
PATH_TO_MISP='/var/www/MISP'
|
||||
|
|
@ -300,20 +312,25 @@ spin()
|
|||
|
||||
# Progress bar
|
||||
progress () {
|
||||
if [[ "$NO_PROGRESS" == "1" ]] || [[ "$PACKER" == "1" ]]; then
|
||||
progress=$[$progress+$1]
|
||||
if [[ "$NO_PROGRESS" == "1" ]] || [[ "$PACKER" == "1" ]]; then
|
||||
echo "progress=${progress}" > /tmp/INSTALL.stat
|
||||
return
|
||||
fi
|
||||
bar="#"
|
||||
|
||||
# Prevent progress of overflowing
|
||||
if [[ $progress -ge 100 ]]; then
|
||||
echo -ne "##################################################################################################### (100%)\r"
|
||||
return
|
||||
fi
|
||||
progress=$[$progress+$1]
|
||||
# Display progress
|
||||
for p in $(seq 1 $progress); do
|
||||
bar+="#"
|
||||
echo -ne "$bar ($p%)\r"
|
||||
done
|
||||
echo -ne '\n'
|
||||
echo "progress=${progress}" > /tmp/INSTALL.stat
|
||||
}
|
||||
|
||||
# Check locale
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
1d07c98b08e82c632e94620be855061e81422f1e INSTALL.sh
|
||||
78a7512203b79a3d2db704c0efaef8e46233dddc INSTALL.sh
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
088bde079f4ece119c475f7b9d0d72c9cb38dfe9dbec8a27a04ce41da5e3dda8 INSTALL.sh
|
||||
aeae851c7253ef80190c98b2b1830c84d03b0e8b49945f112ffd8e1b34b50d58 INSTALL.sh
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
4060ee1f0ca5bad1d60bad44a4da10db5b8ec2463a0a3fb4870509df79adda04edd5f52d40fbca2b95ee06b636e3d504 INSTALL.sh
|
||||
3eba9ca18b79a959295517030addcc87c6edf383c63e387c187acb1ca2901e9da35741b6f1ca71643a17847c7820724c INSTALL.sh
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
e491311f628f241f47bd3a08876d1b29bb34124d28f71e42e90db09f3e29339f2a2df1b627a8fceb512efc1c75124dc72c0c6ab8f9c5a0bbf22143b93c20530f INSTALL.sh
|
||||
7231ed3c4799b1438711d8c45849c6f99b59468485b4d481aa28c6e50efab53081826a157e83be483fd48d8e571fd8bac9d51ef5337c8163f0374efad9aebed7 INSTALL.sh
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
App::uses('JsonExport', 'Export');
|
||||
App::uses('AppModel', 'Model');
|
||||
|
||||
|
||||
class YaraExport
|
||||
|
|
|
|||
|
|
@ -42,30 +42,18 @@ The following assumptions with regard to this installation have been made.
|
|||
|
||||
{!generic/globalVariables.md!}
|
||||
|
||||
```bash
|
||||
# <snippet-begin 0_RHEL_PHP_INI.sh>
|
||||
# RHEL/CentOS Specific
|
||||
RUN_PHP='/usr/bin/scl enable rh-php72'
|
||||
RUN_PYTHON='/usr/bin/scl enable rh-python36'
|
||||
SUDO_WWW='sudo -H -u apache'
|
||||
WWW_USER='apache'
|
||||
|
||||
PHP_INI=/etc/opt/rh/rh-php72/php.ini
|
||||
# <snippet-end 0_RHEL_PHP_INI.sh>
|
||||
```
|
||||
|
||||
!!! note
|
||||
For fresh installs the following tips might be handy.<br />
|
||||
Allow ssh to pass the firewall on the CLI
|
||||
```bash
|
||||
firewall-cmd --zone=public --add-port=22/tcp --permanent
|
||||
firewall-cmd --reload
|
||||
```
|
||||
<br />
|
||||
To quickly make sure if NetworkManager handles your network interface on boot, check in the following location:
|
||||
```
|
||||
/etc/sysconfig/network-scripts/ifcfg-*
|
||||
```
|
||||
For fresh installs the following tips might be handy.<br />
|
||||
Allow ssh to pass the firewall on the CLI
|
||||
```bash
|
||||
firewall-cmd --zone=public --add-port=22/tcp --permanent
|
||||
firewall-cmd --reload
|
||||
```
|
||||
<br />
|
||||
To quickly make sure if NetworkManager handles your network interface on boot, check in the following location:
|
||||
```
|
||||
/etc/sysconfig/network-scripts/ifcfg-*
|
||||
```
|
||||
|
||||
# 1/ OS Install and additional repositories
|
||||
|
||||
|
|
@ -160,6 +148,8 @@ yumInstallCoreDeps () {
|
|||
# Enable and start redis
|
||||
sudo systemctl enable --now rh-redis32-redis.service
|
||||
|
||||
RUN_PHP='/usr/bin/scl enable rh-php72'
|
||||
PHP_INI=/etc/opt/rh/rh-php72/php.ini
|
||||
# Install PHP 7.2 from SCL, see https://www.softwarecollections.org/en/scls/rhscl/rh-php72/
|
||||
sudo yum install rh-php72 rh-php72-php-fpm rh-php72-php-devel \
|
||||
rh-php72-php-mysqlnd \
|
||||
|
|
@ -171,6 +161,7 @@ yumInstallCoreDeps () {
|
|||
|
||||
# Install Python 3.6 from SCL, see
|
||||
# https://www.softwarecollections.org/en/scls/rhscl/rh-python36/
|
||||
RUN_PYTHON='/usr/bin/scl enable rh-python36'
|
||||
sudo yum install rh-python36 -y
|
||||
|
||||
sudo systemctl enable --now rh-php72-php-fpm.service
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# INSTALLATION INSTRUCTIONS for RHEL 8.x (beta) and partially Fedora Server 30
|
||||
# INSTALLATION INSTRUCTIONS for RHEL 8.x and partially Fedora Server 30
|
||||
-------------------------
|
||||
|
||||
### -1/ Installer and Manual install instructions
|
||||
|
||||
Make sure you are reading the parsed version of this Document. When in doubt [click here](https://misp.github.io/MISP/xINSTALL.rhel8/).
|
||||
Make sure you are reading the parsed version of this Document. When in doubt [click here](https://misp.github.io/MISP/INSTALL.rhel8/).
|
||||
|
||||
!!! warning
|
||||
In the **future**, to install MISP on a fresh RHEL 8 install all you need to do is:
|
||||
|
|
@ -27,7 +27,7 @@ Make sure you are reading the parsed version of this Document. When in doubt [cl
|
|||
The core MISP team cannot verify if this guide is working or not. Please help us in keeping it up to date and accurate.
|
||||
Thus we also have difficulties in supporting RHEL issues but will do a best effort on a similar yet slightly different setup.
|
||||
|
||||
This document details the steps to install MISP on Red Hat Enterprise Linux 8.x BETA (RHEL 8.x). At time of this writing it could be tested on version 8.0 BETA.
|
||||
This document details the steps to install MISP on Red Hat Enterprise Linux 8.x (RHEL 8.x).
|
||||
|
||||
The following assumptions with regard to this installation have been made.
|
||||
|
||||
|
|
@ -38,28 +38,18 @@ The following assumptions with regard to this installation have been made.
|
|||
|
||||
{!generic/globalVariables.md!}
|
||||
|
||||
```bash
|
||||
# <snippet-begin 0_RHEL_PHP_INI.sh>
|
||||
# RHEL/CentOS Specific
|
||||
SUDO_WWW='sudo -H -u apache'
|
||||
WWW_USER='apache'
|
||||
|
||||
PHP_INI=/etc/php.ini
|
||||
# <snippet-end 0_RHEL_PHP_INI.sh>
|
||||
```
|
||||
|
||||
!!! note
|
||||
For fresh installs the following tips might be handy.<br />
|
||||
Allow ssh to pass the firewall on the CLI
|
||||
```bash
|
||||
firewall-cmd --zone=public --add-port=22/tcp --permanent
|
||||
firewall-cmd --reload
|
||||
```
|
||||
<br />
|
||||
To quickly make sure if NetworkManager handles your network interface on boot, check in the following location:
|
||||
```
|
||||
/etc/sysconfig/network-scripts/ifcfg-*
|
||||
```
|
||||
For fresh installs the following tips might be handy.<br />
|
||||
Allow ssh to pass the firewall on the CLI
|
||||
```bash
|
||||
firewall-cmd --zone=public --add-port=22/tcp --permanent
|
||||
firewall-cmd --reload
|
||||
```
|
||||
<br />
|
||||
To quickly make sure if NetworkManager handles your network interface on boot, check in the following location:
|
||||
```
|
||||
/etc/sysconfig/network-scripts/ifcfg-*
|
||||
```
|
||||
|
||||
# 1/ OS Install and additional repositories
|
||||
|
||||
|
|
@ -137,6 +127,7 @@ sudo alternatives --set python /usr/bin/python3
|
|||
# Enable and start redis
|
||||
sudo systemctl enable --now redis.service
|
||||
|
||||
PHP_INI=/etc/php.ini
|
||||
sudo yum install php php-fpm php-devel php-pear \
|
||||
php-mysqlnd \
|
||||
php-mbstring \
|
||||
|
|
@ -11,7 +11,19 @@ MISPvars () {
|
|||
MISP_PASSWORD='Password1234'
|
||||
|
||||
# The web server user
|
||||
WWW_USER="www-data"
|
||||
# RHEL/CentOS
|
||||
if [[ -f "/etc/redhat-release" ]]; then
|
||||
WWW_USER='apache'
|
||||
# Debian flavoured
|
||||
elif [[ -f "/etc/debian_version" ]]; then
|
||||
WWW_USER="www-data"
|
||||
# OpenBSD
|
||||
elif [[ "$(uname -s)" == "OpenBSD" ]]; then
|
||||
WWW_USER="www"
|
||||
else
|
||||
# I am feeling lucky
|
||||
WWW_USER="www-data"
|
||||
fi
|
||||
|
||||
# MISP configuration variables
|
||||
PATH_TO_MISP='/var/www/MISP'
|
||||
|
|
|
|||
|
|
@ -160,20 +160,25 @@ spin()
|
|||
|
||||
# Progress bar
|
||||
progress () {
|
||||
if [[ "$NO_PROGRESS" == "1" ]] || [[ "$PACKER" == "1" ]]; then
|
||||
progress=$[$progress+$1]
|
||||
if [[ "$NO_PROGRESS" == "1" ]] || [[ "$PACKER" == "1" ]]; then
|
||||
echo "progress=${progress}" > /tmp/INSTALL.stat
|
||||
return
|
||||
fi
|
||||
bar="#"
|
||||
|
||||
# Prevent progress of overflowing
|
||||
if [[ $progress -ge 100 ]]; then
|
||||
echo -ne "##################################################################################################### (100%)\r"
|
||||
return
|
||||
fi
|
||||
progress=$[$progress+$1]
|
||||
# Display progress
|
||||
for p in $(seq 1 $progress); do
|
||||
bar+="#"
|
||||
echo -ne "$bar ($p%)\r"
|
||||
done
|
||||
echo -ne '\n'
|
||||
echo "progress=${progress}" > /tmp/INSTALL.stat
|
||||
}
|
||||
|
||||
# Check locale
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ nav:
|
|||
- 'Ubuntu 18.04': 'INSTALL.ubuntu1804.md'
|
||||
- 'Kali Linux': 'INSTALL.kali.md'
|
||||
- 'RHEL7/CentOS7': 'INSTALL.rhel7.md'
|
||||
- 'RHEL8': 'INSTALL.rhel8.md'
|
||||
- xInstall Guides:
|
||||
- 'Warning': 'xINSTALL.md'
|
||||
- 'Centos 6': 'xINSTALL.centos6.md'
|
||||
|
|
@ -79,7 +80,6 @@ nav:
|
|||
- 'Ubuntu 18.04 \w webmin': 'xINSTALL.ubuntu1804.with.webmin.md'
|
||||
- 'Tsurugi Linux': 'xINSTALL.tsurugi.md'
|
||||
- 'OpenBSD 6.5': 'xINSTALL.OpenBSD.md'
|
||||
- 'RHEL8 (Beta)': 'xINSTALL.rhel8.md'
|
||||
- Config Guides:
|
||||
- 'Elastic Search Logging': 'CONFIG.elasticsearch-logging.md'
|
||||
- 'Amazon S3 attachments': 'CONFIG.s3-attachments.md'
|
||||
|
|
|
|||
Loading…
Reference in New Issue