Bump misp-modules and revert some defaults

.gitignore

@@ -5,3 +5,4 @@
 /ssl/
 .env
 env.hcl
+rootca.crt

README.md

@@ -90,6 +90,11 @@ If you are trying to accomplish something and the above behaviours get in the wa
 
 To override these behaviours edit the docker-compose.yml file's misp-core volume definitions to enable the "customize_misp.sh" behaviour (see the bottom of the Production section for details). The "customize_misp.sh" script triggers after the above behaviours complete and is an appropriate place to override a setting. It is suggested that you use the "/var/www/MISP/app/cake Admin setSetting" command to override a setting, as this tool is config.php file and database setting aware.
 
+#### Adding a new setting and unsure what files to edit?
+
+If it is just a default setting that is meant to be set if not already set by the user, add it in one of the `*.default.json` files.
+If it is a setting controlled by an environment variable which is meant to override whatever is set, add it in one of the `*.envars.json` files (note that you can still specify a default value).
+
 ### Production
 
 -   It is recommended to specify the build you want run by editing `docker-compose.yml` (see here for the list of available tags https://github.com/orgs/MISP/packages)

core/files/configure_misp.sh

@@ -223,7 +223,7 @@ apply_updates() {
 
 init_user() {
     # Create the main user if it is not there already
-    sudo -u www-data /var/www/MISP/app/Console/cake userInit -q 2>&1 > /dev/null
+    sudo -u www-data /var/www/MISP/app/Console/cake user init -q 2>&1 > /dev/null
 
     echo "UPDATE misp.users SET email = \"${ADMIN_EMAIL}\" WHERE id = 1;" | ${MYSQLCMD}
 

core/files/etc/misp-docker/cli_only.defaults.json

@@ -21,7 +21,7 @@
     "default_value": false
   },
   "MISP.ca_path": {
-    "default_value": "/var/www/MISP/app/Lib/cakephp/lib/Cake/Config/cacert.pem"
+    "default_value": "/etc/ssl/certs/ca-certificates.crt"
   },
   "MISP.menu_custom_right_link": {
     "default_value": ""

core/files/etc/misp-docker/initialisation.defaults.json

@@ -62,6 +62,9 @@
   "MISP.showCorrelationsOnIndex": {
     "default_value": true
   },
+  "MISP.server_settings_skip_backup_rotate": {
+    "default_value": false
+  },
   "MISP.user_email_notification_ban": {
     "default_value": true
   },

modules/Dockerfile

@@ -34,8 +34,6 @@ FROM "${DOCKER_HUB_PROXY}python:3.11-slim-bullseye" as python-build
         echo "pyeti" >> REQUIREMENTS
         echo "greynoise" >> REQUIREMENTS
         echo "git+https://github.com/abenassi/Google-Search-API" >> REQUIREMENTS
-        sed -i 's|.*apiosintDS.*|apiosintDS==2.0.1|g' REQUIREMENTS
-        # let apiosintDS decide since misp-modules doesn't actually use this package anyway
         sed -i '/validators.*/d' REQUIREMENTS
         sed -i 's/-e //g' REQUIREMENTS
         pip3 wheel -r REQUIREMENTS --no-cache-dir -w /wheels/

template.env

@@ -3,7 +3,7 @@
 ##
 
 CORE_TAG=v2.4.192
-MODULES_TAG=v2.4.188
+MODULES_TAG=v2.4.192
 PHP_VER=20190902
 LIBFAUP_COMMIT=3a26d0a