mirror of https://github.com/MISP/misp-docker
Remove default value in favour of env var
parent
60902dbcdc
commit
7ef14a06f5
|
@ -221,10 +221,10 @@ init_user() {
|
|||
# Create the main user if it is not there already
|
||||
sudo -u www-data /var/www/MISP/app/Console/cake user init -q > /dev/null 2>&1
|
||||
|
||||
echo "UPDATE misp.users SET email = \"${ADMIN_EMAIL}\" WHERE id = 1;" | ${MYSQLCMD}
|
||||
echo "UPDATE $MYSQL_DATABASE.users SET email = \"${ADMIN_EMAIL}\" WHERE id = 1;" | ${MYSQLCMD}
|
||||
|
||||
if [ ! -z "$ADMIN_ORG" ]; then
|
||||
echo "UPDATE misp.organisations SET name = \"${ADMIN_ORG}\" where id = 1;" | ${MYSQLCMD}
|
||||
echo "UPDATE $MYSQL_DATABASE.organisations SET name = \"${ADMIN_ORG}\" where id = 1;" | ${MYSQLCMD}
|
||||
fi
|
||||
|
||||
if [ -n "$ADMIN_KEY" ]; then
|
||||
|
@ -254,7 +254,7 @@ init_user() {
|
|||
else
|
||||
echo "... setting admin password skipped"
|
||||
fi
|
||||
echo 'UPDATE misp.users SET change_pw = 0 WHERE id = 1;' | ${MYSQLCMD}
|
||||
echo "UPDATE $MYSQL_DATABASE.users SET change_pw = 0 WHERE id = 1;" | ${MYSQLCMD}
|
||||
}
|
||||
|
||||
apply_critical_fixes() {
|
||||
|
|
|
@ -73,9 +73,6 @@
|
|||
"SimpleBackgroundJobs.redis_database": {
|
||||
"default_value": 1
|
||||
},
|
||||
"SimpleBackgroundJobs.redis_password": {
|
||||
"default_value": ""
|
||||
},
|
||||
"SimpleBackgroundJobs.redis_namespace": {
|
||||
"default_value": "background_jobs"
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue