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

Remove default value in favour of env var

pull/122/head
Stefano Ortolani 2024-08-19 12:33:49 +01:00
parent 60902dbcdc
commit 7ef14a06f5
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/files/configure_misp.sh
View File

@ -221,10 +221,10 @@ init_user() {
# Create the main user if it is not there already # 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 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 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 fi
if [ -n "$ADMIN_KEY" ]; then if [ -n "$ADMIN_KEY" ]; then
@ -254,7 +254,7 @@ init_user() {
else else
echo "... setting admin password skipped" echo "... setting admin password skipped"
fi 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() { apply_critical_fixes() {

3
core/files/etc/misp-docker/minimum_config.defaults.json
View File

@ -73,9 +73,6 @@
"SimpleBackgroundJobs.redis_database": { "SimpleBackgroundJobs.redis_database": {
"default_value": 1 "default_value": 1
}, },
"SimpleBackgroundJobs.redis_password": {
"default_value": ""
},
"SimpleBackgroundJobs.redis_namespace": { "SimpleBackgroundJobs.redis_namespace": {
"default_value": "background_jobs" "default_value": "background_jobs"
}, },