Browse Source

fix tilde paths

tags/v0.1.8
Jonathan Cobb 4 years ago
parent
commit
f37199ee4e
3 changed files with 3 additions and 3 deletions
  1. +1
    -1
      automation/roles/bubble/templates/refresh_bubble_ssh_keys.sh.j2
  2. +1
    -1
      automation/roles/bubble/templates/snapshot_ansible.sh.j2
  3. +1
    -1
      bubble-server/src/main/resources/ansible/install_local.sh.hbs

+ 1
- 1
automation/roles/bubble/templates/refresh_bubble_ssh_keys.sh.j2 View File

@@ -38,7 +38,7 @@ done
# Retain self-generated ansible setup key # Retain self-generated ansible setup key
ANSIBLE_USER="{{admin_user}}" ANSIBLE_USER="{{admin_user}}"
if [[ ! -z "${ANSIBLE_USER}" ]] ; then if [[ ! -z "${ANSIBLE_USER}" ]] ; then
PUB_FILE="$(cd "~{{admin_user}}" && pwd)/.ssh/bubble_rsa.pub"
PUB_FILE="$(cd ~{{admin_user}} && pwd)/.ssh/bubble_rsa.pub"
if [[ -f "${PUB_FILE}" ]] ; then if [[ -f "${PUB_FILE}" ]] ; then
cat "${PUB_FILE}" >> ${NEW_KEYS} cat "${PUB_FILE}" >> ${NEW_KEYS}
fi fi


+ 1
- 1
automation/roles/bubble/templates/snapshot_ansible.sh.j2 View File

@@ -23,7 +23,7 @@ if [[ $(whoami) != "{{ admin_user }}" ]] ; then
die "${0} must be run as {{ admin_user }}" die "${0} must be run as {{ admin_user }}"
fi fi


ANSIBLE_USER_HOME=$(cd "~{{ admin_user }}" && pwd)
ANSIBLE_USER_HOME=$(cd ~{{ admin_user }} && pwd)


ANSIBLE_SNAPSHOT="/home/bubble/ansible.tgz" ANSIBLE_SNAPSHOT="/home/bubble/ansible.tgz"




+ 1
- 1
bubble-server/src/main/resources/ansible/install_local.sh.hbs View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash


ANSIBLE_USER="{{node.user}}" ANSIBLE_USER="{{node.user}}"
ANSIBLE_HOME="$(cd "~{{node.user}}" && pwd)"
ANSIBLE_HOME="$(cd ~{{node.user}} && pwd)"
LOG="${ANSIBLE_HOME}/.ansible.log" LOG="${ANSIBLE_HOME}/.ansible.log"


function log { function log {


Loading…
Cancel
Save