Merge branch 'master' into add-web-and-enterprise-sign-in

Author: thejsj

ansible/roles/dock_launch_config/tasks/main.yml

@@ -14,7 +14,7 @@
 # this requires the use of gnu/coreutils base64 (`brew install coreutils`)
 # Allows us to use same base64 locally and in host
 - name: encode krain config to base64
-  shell: cat ~/{{ app_name }}.conf | base64 -w 0
+  shell: cat ~/{{ app_name }}.conf | gbase64 -w 0
   register: krain_base64
   vars:
     - app_name: "krain"
@@ -34,7 +34,7 @@
 # this requires the use of gnu/coreutils base64 (`brew install coreutils`)
 # Allows us to use same base64 locally and in host
 - name: encode charon config to base64
-  shell: cat ~/{{ app_name }}.conf | base64 -w 0
+  shell: cat ~/{{ app_name }}.conf | gbase64 -w 0
   register: charon_base64
   vars:
     - app_name: "charon"
@@ -48,15 +48,15 @@
     - { file_name: 'token-03', value: "{{ vault_token_03 }}" }
 
 - name: encode ca.pem to base64
-  shell: cat ./certs/ca.pem | base64 -w 0
+  shell: cat ./certs/ca.pem | gbase64 -w 0
   register: ca_pem_base64
 
 - name: encode ca-key.pem to base64
-  shell: cat ./certs/ca-key.pem | base64 -w 0
+  shell: cat ./certs/ca-key.pem | gbase64 -w 0
   register: ca_key_pem_base64
 
 - name: encode pass to base64
-  shell: cat ./certs/pass | base64 -w 0
+  shell: cat ./certs/pass | gbase64 -w 0
   register: pass_base64
 
 - name: Generate dock script