From c5eac0abdf7f7c3293f27c241c777d35acdd4522 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Wed, 19 Feb 2020 18:24:21 -0500
Subject: [PATCH] mitm cert name is now named after server alias

---
 automation/roles/bubble_finalizer/files/bubble_role.json    | 1 +
 automation/roles/bubble_finalizer/tasks/main.yml            | 2 +-
 bubble-server/src/main/resources/ansible/default_roles.json | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/automation/roles/bubble_finalizer/files/bubble_role.json b/automation/roles/bubble_finalizer/files/bubble_role.json
index 947a53e4..bfd9201b 100644
--- a/automation/roles/bubble_finalizer/files/bubble_role.json
+++ b/automation/roles/bubble_finalizer/files/bubble_role.json
@@ -3,6 +3,7 @@
   "priority": 9999999,
   "template": true,
   "config": [
+    {"name": "server_alias", "value": "[[network.networkDomain]]"},
     {"name": "restore_key", "value": "[[restoreKey]]"},
     {"name": "install_type", "value": "[[installType]]"},
     {"name": "bubble_java_opts", "value": "-Xms[[expr nodeSize.memoryMB '//' 2]]m -Xmx[[expr nodeSize.memoryMB '//' 2]]m"}
diff --git a/automation/roles/bubble_finalizer/tasks/main.yml b/automation/roles/bubble_finalizer/tasks/main.yml
index b6796960..9c97d56b 100644
--- a/automation/roles/bubble_finalizer/tasks/main.yml
+++ b/automation/roles/bubble_finalizer/tasks/main.yml
@@ -10,7 +10,7 @@
   when: restore_key is defined
 
 - name: Install mitmproxy CA cert in local CA store
-  shell: install_cert.sh /home/mitmproxy/.mitmproxy/bubble-ca-cert.pem 600
+  shell: install_cert.sh /home/mitmproxy/.mitmproxy/{{ server_alias }}-ca-cert.pem 600
   when: install_type == 'node'
 
 - name: Install copy_certs_to_bubble.sh helper
diff --git a/bubble-server/src/main/resources/ansible/default_roles.json b/bubble-server/src/main/resources/ansible/default_roles.json
index c95ae496..2abce282 100644
--- a/bubble-server/src/main/resources/ansible/default_roles.json
+++ b/bubble-server/src/main/resources/ansible/default_roles.json
@@ -97,8 +97,10 @@
     "priority": 9999999,
     "template": true,
     "config": [
+      {"name": "server_alias", "value": "[[network.networkDomain]]"},
       {"name": "restore_key", "value": "[[restoreKey]]"},
-      {"name": "install_type", "value": "[[installType]]"}
+      {"name": "install_type", "value": "[[installType]]"},
+      {"name": "bubble_java_opts", "value": "-Xms[[expr nodeSize.memoryMB '//' 2]]m -Xmx[[expr nodeSize.memoryMB '//' 2]]m"}
     ],
     "optionalConfigNames": ["restore_key"],
     "tgzB64": ""