From 9cd6b230c2acd3b92d3ffe95b415d80523fddc04 Mon Sep 17 00:00:00 2001
From: Rawane Boubrima <rawane.boubrima7@etu.univ-lorraine.fr>
Date: Mon, 22 May 2023 08:45:53 +0200
Subject: [PATCH] changement

---
 conffiles/issue |   2 +-
 misp.json       | 116 +++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 95 insertions(+), 23 deletions(-)

diff --git a/conffiles/issue b/conffiles/issue
index c8a69ec..5db67ad 100644
--- a/conffiles/issue
+++ b/conffiles/issue
@@ -1,4 +1,4 @@
-Ubuntu 18.04.1 LTS \n \l
+Ubuntu 20.04.1 LTS \n \l
 
 Welcome to the MISP Threat Sharing VM.
 ---
diff --git a/misp.json b/misp.json
index 900cc7a..4ebfaf2 100644
--- a/misp.json
+++ b/misp.json
@@ -23,10 +23,14 @@
       "disk_size": "{{user `disk_size`}}",
       "export_opts": [
         "--manifest",
-        "--vsys", "0",
-        "--eulafile", "/tmp/LICENSE-misp",
-        "--description", "{{user `vm_description`}}",
-        "--version", "{{user `vm_version`}}"
+        "--vsys",
+        "0",
+        "--eulafile",
+        "/tmp/LICENSE-misp",
+        "--description",
+        "{{user `vm_description`}}",
+        "--version",
+        "{{user `vm_version`}}"
       ],
       "format": "ova",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
@@ -36,8 +40,7 @@
       "http_directory": "preseeds",
       "http_port_max": 9011,
       "http_port_min": 9001,
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "{{ user `iso_checksum_type` }}",
+      "iso_checksum": "{{ user `iso_checksum_type` }}:{{ user `iso_checksum` }}",
       "iso_urls": [
         "{{ user `iso_path` }}/{{ user `iso_name` }}",
         "{{ user `iso_url` }}"
@@ -49,20 +52,90 @@
       "ssh_username": "{{user `ssh_name`}}",
       "type": "virtualbox-iso",
       "vboxmanage": [
-        [ "modifyvm", "{{.Name}}", "--memory", "{{user `memory`}}" ],
-        [ "modifyvm", "{{.Name}}", "--natpf1", "ssh,tcp,,2222,0.0.0.0,22" ],
-        [ "modifyvm", "{{.Name}}", "--natpf1", "http,tcp,,8080,,80" ],
-        [ "modifyvm", "{{.Name}}", "--natpf1", "https,tcp,,8443,,443" ],
-        [ "modifyvm", "{{.Name}}", "--natpf1", "dashboard,tcp,,8001,0.0.0.0,8001" ],
-        [ "modifyvm", "{{.Name}}", "--natpf1", "viper,tcp,,8888,0.0.0.0,8888" ],
-        [ "modifyvm", "{{.Name}}", "--natpf1", "jupyter-notebook,tcp,,8889,0.0.0.0,8889" ],
-        [ "modifyvm", "{{.Name}}", "--natpf1", "misp-modules,tcp,,1666,0.0.0.0,6666" ],
-        [ "modifyvm", "{{.Name}}", "--audio", "none" ],
-        [ "modifyvm", "{{.Name}}", "--graphicscontroller", "vmsvga" ],
-        [ "modifyvm", "{{.Name}}", "--usb", "off" ],
-        [ "modifyvm", "{{.Name}}", "--vrde", "off" ],
-        [ "modifyvm", "{{.Name}}", "--cpus", "{{user `cpus`}}" ],
-        [ "modifyvm", "{{.Name}}", "--vram", "32" ]
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "{{user `memory`}}"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--natpf1",
+          "ssh,tcp,,2222,0.0.0.0,22"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--natpf1",
+          "http,tcp,,8080,,80"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--natpf1",
+          "https,tcp,,8443,,443"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--natpf1",
+          "dashboard,tcp,,8001,0.0.0.0,8001"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--natpf1",
+          "viper,tcp,,8888,0.0.0.0,8888"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--natpf1",
+          "jupyter-notebook,tcp,,8889,0.0.0.0,8889"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--natpf1",
+          "misp-modules,tcp,,1666,0.0.0.0,6666"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--audio",
+          "none"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--graphicscontroller",
+          "vmsvga"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--usb",
+          "off"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--vrde",
+          "off"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "{{user `cpus`}}"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--vram",
+          "32"
+        ]
       ],
       "vm_name": "{{user `vm_name`}}"
     },
@@ -84,8 +157,7 @@
       "http_directory": "preseeds",
       "http_port_max": 9011,
       "http_port_min": 9001,
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "{{ user `iso_checksum_type` }}",
+      "iso_checksum": "{{ user `iso_checksum_type` }}:{{ user `iso_checksum` }}",
       "iso_urls": [
         "{{ user `iso_path` }}/{{ user `iso_name` }}",
         "{{ user `iso_url` }}"