@@ -14,7 +14,7 @@ function log { | |||||
echo "$(date): ${1}" >> ${LOG} | echo "$(date): ${1}" >> ${LOG} | ||||
} | } | ||||
ALGO_BASE=/root/ansible/roles/algo/algo-master | |||||
ALGO_BASE=/root/ansible/roles/algo/algo | |||||
if [[ ! -d ${ALGO_BASE} ]] ; then | if [[ ! -d ${ALGO_BASE} ]] ; then | ||||
die "Algo VPN directory ${ALGO_BASE} not found" | die "Algo VPN directory ${ALGO_BASE} not found" | ||||
fi | fi | ||||
@@ -14,7 +14,7 @@ function log { | |||||
echo "$(date): ${1}" >> ${LOG} | echo "$(date): ${1}" >> ${LOG} | ||||
} | } | ||||
ALGO_BASE=/root/ansible/roles/algo/algo-master | |||||
ALGO_BASE=/root/ansible/roles/algo/algo | |||||
if [[ ! -d ${ALGO_BASE} ]] ; then | if [[ ! -d ${ALGO_BASE} ]] ; then | ||||
die "Algo VPN directory ${ALGO_BASE} not found" | die "Algo VPN directory ${ALGO_BASE} not found" | ||||
fi | fi | ||||
@@ -14,7 +14,7 @@ function log { | |||||
echo "$(date): ${1}" >> ${LOG} | echo "$(date): ${1}" >> ${LOG} | ||||
} | } | ||||
ALGO_CONFIGS=/root/ansible/roles/algo/algo-master/configs | |||||
ALGO_CONFIGS=/root/ansible/roles/algo/algo/configs | |||||
BUBBLE_DEVICE_DIR=/home/bubble/wg_devices | BUBBLE_DEVICE_DIR=/home/bubble/wg_devices | ||||
if [[ ! -d ${BUBBLE_DEVICE_DIR} ]] ; then | if [[ ! -d ${BUBBLE_DEVICE_DIR} ]] ; then | ||||
mkdir -p ${BUBBLE_DEVICE_DIR} && chown -R bubble ${BUBBLE_DEVICE_DIR} && chmod 700 ${BUBBLE_DEVICE_DIR} || die "Error creating ${BUBBLE_DEVICE_DIR}" | mkdir -p ${BUBBLE_DEVICE_DIR} && chown -R bubble ${BUBBLE_DEVICE_DIR} && chmod 700 ${BUBBLE_DEVICE_DIR} || die "Error creating ${BUBBLE_DEVICE_DIR}" | ||||
@@ -9,7 +9,7 @@ | |||||
- name: Write algo config.cfg.hbs | - name: Write algo config.cfg.hbs | ||||
copy: | copy: | ||||
src: config.cfg.hbs | src: config.cfg.hbs | ||||
dest: /root/ansible/roles/algo/algo-master/config.cfg.hbs | |||||
dest: /root/ansible/roles/algo/algo/config.cfg.hbs | |||||
- name: Install algo_refresh_users script and monitor | - name: Install algo_refresh_users script and monitor | ||||
copy: | copy: | ||||
@@ -30,7 +30,7 @@ | |||||
- name: Write install_algo.sh template | - name: Write install_algo.sh template | ||||
template: | template: | ||||
src: install_algo.sh.j2 | src: install_algo.sh.j2 | ||||
dest: /root/ansible/roles/algo/algo-master/install_algo.sh | |||||
dest: /root/ansible/roles/algo/algo/install_algo.sh | |||||
owner: root | owner: root | ||||
group: root | group: root | ||||
mode: 0500 | mode: 0500 | ||||
@@ -50,7 +50,7 @@ | |||||
# Don't setup algo when in restore mode, bubble_restore_monitor.sh will set it up after the CA key has been restored | # Don't setup algo when in restore mode, bubble_restore_monitor.sh will set it up after the CA key has been restored | ||||
- name: Run algo playbook to install algo | - name: Run algo playbook to install algo | ||||
shell: /root/ansible/roles/algo/algo-master/install_algo.sh | |||||
shell: /root/ansible/roles/algo/algo/install_algo.sh | |||||
when: restore_key is not defined | when: restore_key is not defined | ||||
# Don't start monitors when in restore mode, bubble_restore_monitor.sh will start it after algo is installed | # Don't start monitors when in restore mode, bubble_restore_monitor.sh will start it after algo is installed | ||||
@@ -111,7 +111,7 @@ CONFIGS_BACKUP=/home/bubble/.BUBBLE_ALGO_CONFIGS.tgz | |||||
if [[ ! -f ${CONFIGS_BACKUP} ]] ; then | if [[ ! -f ${CONFIGS_BACKUP} ]] ; then | ||||
log "Warning: Algo VPN configs backup not found: ${CONFIGS_BACKUP}, not installing algo" | log "Warning: Algo VPN configs backup not found: ${CONFIGS_BACKUP}, not installing algo" | ||||
else | else | ||||
ALGO_BASE=/root/ansible/roles/algo/algo-master | |||||
ALGO_BASE=/root/ansible/roles/algo/algo | |||||
if [[ ! -d ${ALGO_BASE} ]] ; then | if [[ ! -d ${ALGO_BASE} ]] ; then | ||||
die "Error restoring Algo VPN: directory ${ALGO_BASE} not found" | die "Error restoring Algo VPN: directory ${ALGO_BASE} not found" | ||||
fi | fi | ||||