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

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/4877/head
iglocska 2019-07-12 08:59:18 +02:00
parent 35ecd0a402 98007d340b
commit 49104318ca
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
9 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
INSTALL/INSTALL.sh
View File

@ -73,6 +73,9 @@ MISPvars () {
MISP_USER='misp'
MISP_PASSWORD="$(openssl rand -hex 32)"
# MISP configuration variables
PATH_TO_MISP='/var/www/MISP'
# The web server user
# RHEL/CentOS
if [[ -f "/etc/redhat-release" ]]; then
@ -83,14 +86,16 @@ MISPvars () {
# OpenBSD
elif [[ "$(uname -s)" == "OpenBSD" ]]; then
WWW_USER="www"
PATH_TO_MISP="/var/www/htdocs/MISP"
# NetBSD
elif [[ "$(uname -s)" == "NetBSD" ]]; then
WWW_USER="www"
PATH_TO_MISP="/usr/pkg/share/httpd/htdocs/MISP"
else
# I am feeling lucky
# I am feeling lucky
WWW_USER="www-data"
fi
# MISP configuration variables
PATH_TO_MISP='/var/www/MISP'
if [ -z "$FQDN" ]; then
FQDN="misp.local"
fi
@ -1091,8 +1096,10 @@ checkSudoKeeper () {
su -c "apt install etckeeper -y"
echo "Please enter your root password below to install sudo"
su -c "apt install sudo -y"
echo "Please enter your root password below to install sudo"
su -c "apt install curl -y"
echo "Please enter your root password below to add ${MISP_USER} to sudo group"
su -c "adduser ${MISP_USER} sudo"
su -c "/usr/sbin/adduser ${MISP_USER} sudo"
echo "We added ${MISP_USER} to group sudo and now we need to log out and in again."
exit
else
@ -1104,7 +1111,7 @@ checkSudoKeeper () {
installCoreDeps () {
debug "Installing core dependencies"
# Install the dependencies: (some might already be installed)
sudo apt-get install curl gcc git gpg-agent make python python3 openssl redis-server sudo vim zip unzip virtualenv libfuzzy-dev sqlite3 -qy
sudo apt-get install curl gcc git gpg-agent make python python3 openssl redis-server sudo vim zip unzip virtualenv libfuzzy-dev sqlite3 moreutils -qy
# Install MariaDB (a MySQL fork/alternative)
sudo apt-get install mariadb-client mariadb-server -qy
@ -1922,7 +1929,7 @@ generateInstaller () {
cp ../INSTALL.tpl.sh .
# Pull code snippets out of Main Install Documents
for f in `echo INSTALL.ubuntu1804.md xINSTALL.debian9.md INSTALL.kali.md xINSTALL.debian_testing.md xINSTALL.tsurugi.md xINSTALL.debian9-postgresql.md xINSTALL.ubuntu1804.with.webmin.md`; do
for f in `echo INSTALL.ubuntu1804.md xINSTALL.debian9.md INSTALL.kali.md xINSTALL.debian10.md xINSTALL.tsurugi.md xINSTALL.debian9-postgresql.md xINSTALL.ubuntu1804.with.webmin.md`; do
xsnippet . ../../docs/${f}
done

6
INSTALL/INSTALL.sh.sfv
View File

@ -1,5 +1,5 @@
; Generated by RHash v1.3.8 on 2019-07-02 at 12:28.32
; Generated by RHash v1.3.8 on 2019-07-12 at 13:22.33
; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
;
; 99476 12:28.32 2019-07-02 INSTALL.sh
INSTALL.sh 064C49340280B33DA2078761BB649794D8E31F6C 86BA12B0F85366B89106C901341C43D39ABB4F1EF546143D40EE44CD7DA578F7 AAE62AA039BA822CD39A5937DCBD22F0AC991802DED6F94A0F9754BE87CA091E9EAF457C5AB1831E6C583F4F0B286BE3 D77A1290A34453EFCCA50970FED5BC7035C49652E35EDC4108D82A7C4BA3CF1F020B41D36DD2E80AA9A557CF3F176F370CFC797130E9956C859E48AC272832E8
; 99756 13:22.33 2019-07-12 INSTALL.sh
INSTALL.sh E83E4EA31F2871A76F4CF22FE64F044D1CDD4B29 177D80E4BF987AE42A31AC68DFB5C7D89C816D645C089F6FE22F32B294B61BB1 E1D90329E0146DC5971AF665EE27A6A4C43EAA3AAEF92012619A811310D36BFF4BC4B956F4E78E18242ECFB721048FE2 C3CB3684B791444EE08F7741EEE8D6687ACDFB1D767D70A350DF91585F6DD47080E601EEF96C1485D1284A085D7A31B8904DCDF4EAD096A81C6F4B2BDDBA2AF2

2
INSTALL/INSTALL.sh.sha1
View File

@ -1 +1 @@
064c49340280b33da2078761bb649794d8e31f6c INSTALL.sh
e83e4ea31f2871a76f4cf22fe64f044d1cdd4b29 INSTALL.sh

2
INSTALL/INSTALL.sh.sha256
View File

@ -1 +1 @@
86ba12b0f85366b89106c901341c43d39abb4f1ef546143d40ee44cd7da578f7 INSTALL.sh
177d80e4bf987ae42a31ac68dfb5c7d89c816d645c089f6fe22f32b294b61bb1 INSTALL.sh

2
INSTALL/INSTALL.sh.sha384
View File

@ -1 +1 @@
aae62aa039ba822cd39a5937dcbd22f0ac991802ded6f94a0f9754be87ca091e9eaf457c5ab1831e6c583f4f0b286be3 INSTALL.sh
e1d90329e0146dc5971af665ee27a6a4c43eaa3aaef92012619a811310d36bff4bc4b956f4e78e18242ecfb721048fe2 INSTALL.sh

2
INSTALL/INSTALL.sh.sha512
View File

@ -1 +1 @@
d77a1290a34453efcca50970fed5bc7035c49652e35edc4108d82a7c4ba3cf1f020b41d36dd2e80aa9a557cf3f176f370cfc797130e9956c859e48ac272832e8 INSTALL.sh
c3cb3684b791444ee08f7741eee8d6687acdfb1d767d70a350df91585f6dd47080e601eef96c1485d1284a085d7a31b8904dcdf4ead096a81c6f4b2bddba2af2 INSTALL.sh

2
INSTALL/INSTALL.tpl.sh
View File

@ -128,7 +128,7 @@ generateInstaller () {
cp ../INSTALL.tpl.sh .
# Pull code snippets out of Main Install Documents
for f in `echo INSTALL.ubuntu1804.md xINSTALL.debian9.md INSTALL.kali.md xINSTALL.debian_testing.md xINSTALL.tsurugi.md xINSTALL.debian9-postgresql.md xINSTALL.ubuntu1804.with.webmin.md`; do
for f in `echo INSTALL.ubuntu1804.md xINSTALL.debian9.md INSTALL.kali.md xINSTALL.debian10.md xINSTALL.tsurugi.md xINSTALL.debian9-postgresql.md xINSTALL.ubuntu1804.with.webmin.md`; do
xsnippet . ../../docs/${f}
done

2
app/files/misp-objects

@ -1 +1 @@
Subproject commit ebdaa49cbd636322b0473c74342b09ddce3faf23
Subproject commit 919f6638e1dbea333f10d8123eea16a090322931

2
docs/INSTALL.ubuntu1804.md
View File

@ -89,7 +89,7 @@ Once the system is installed you can perform the following steps.
installCoreDeps () {
debug "Installing core dependencies"
# Install the dependencies: (some might already be installed)
sudo apt-get install curl gcc git gpg-agent make python python3 openssl redis-server sudo vim zip unzip virtualenv libfuzzy-dev sqlite3 -qy
sudo apt-get install curl gcc git gpg-agent make python python3 openssl redis-server sudo vim zip unzip virtualenv libfuzzy-dev sqlite3 moreutils -qy
# Install MariaDB (a MySQL fork/alternative)
sudo apt-get install mariadb-client mariadb-server -qy