Browse Source

mitm cert name is now named after server alias

tags/v0.8.0
Jonathan Cobb 5 years ago
parent
commit
c5eac0abdf
3 changed files with 5 additions and 2 deletions
  1. +1
    -0
      automation/roles/bubble_finalizer/files/bubble_role.json
  2. +1
    -1
      automation/roles/bubble_finalizer/tasks/main.yml
  3. +3
    -1
      bubble-server/src/main/resources/ansible/default_roles.json

+ 1
- 0
automation/roles/bubble_finalizer/files/bubble_role.json View File

@@ -3,6 +3,7 @@
"priority": 9999999, "priority": 9999999,
"template": true, "template": true,
"config": [ "config": [
{"name": "server_alias", "value": "[[network.networkDomain]]"},
{"name": "restore_key", "value": "[[restoreKey]]"}, {"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"} {"name": "bubble_java_opts", "value": "-Xms[[expr nodeSize.memoryMB '//' 2]]m -Xmx[[expr nodeSize.memoryMB '//' 2]]m"}


+ 1
- 1
automation/roles/bubble_finalizer/tasks/main.yml View File

@@ -10,7 +10,7 @@
when: restore_key is defined when: restore_key is defined


- name: Install mitmproxy CA cert in local CA store - 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' when: install_type == 'node'


- name: Install copy_certs_to_bubble.sh helper - name: Install copy_certs_to_bubble.sh helper


+ 3
- 1
bubble-server/src/main/resources/ansible/default_roles.json View File

@@ -97,8 +97,10 @@
"priority": 9999999, "priority": 9999999,
"template": true, "template": true,
"config": [ "config": [
{"name": "server_alias", "value": "[[network.networkDomain]]"},
{"name": "restore_key", "value": "[[restoreKey]]"}, {"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"], "optionalConfigNames": ["restore_key"],
"tgzB64": "" "tgzB64": ""


Loading…
Cancel
Save