mirror of https://github.com/MISP/MISP
chg: [installer] Updated to latest installer
parent
c46ef49831
commit
730c0d7531
|
@ -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 () {
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue