Merge branch 'mailbox' into 'master'

Rename mail-global to mailbox See merge request !101

Merge branch 'mailbox' into 'master'
Rename mail-global to mailbox See merge request !101
6245f391 · BERARD Benjamin · c1cd7e31 · 41d42f17 · 6245f391 · 6245f391
Commit 6245f391 authored 4 years ago by BERARD Benjamin
--- a/data/grid5000/sites/lille/servers/mail-global.json
+++ b/data/grid5000/sites/lille/servers/mail-global.json
@@ -6,5 +6,5 @@
    }
  },
  "type": "server",
-  "uid": "mail-global"
+  "uid": "mailbox"
 }
\ No newline at end of file
--- a/input/grid5000/sites/lille/servers/virtual.yaml
+++ b/input/grid5000/sites/lille/servers/virtual.yaml
@@ -260,7 +260,7 @@ frontend-dev:
  network_adapters:
    default:
      ip: 172.16.47.156
-mail-global:
+mailbox:
  kind: virtual
  network_adapters:
    default: