rename algo install dir

automation/roles/algo/files/algo_refresh_users.sh

@@ -14,7 +14,7 @@ function 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
   die "Algo VPN directory ${ALGO_BASE} not found"
 fi

automation/roles/algo/files/algo_refresh_users_monitor.sh

@@ -14,7 +14,7 @@ function 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
   die "Algo VPN directory ${ALGO_BASE} not found"
 fi

automation/roles/algo/files/wg_monitor_connections.sh

@@ -14,7 +14,7 @@ function 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
 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}"

automation/roles/algo/tasks/main.yml

@@ -9,7 +9,7 @@
 - name: Write algo config.cfg.hbs
   copy:
     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
   copy:
@@ -30,7 +30,7 @@
 - name: Write install_algo.sh template
   template:
     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
     group: root
     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
 - 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
 
 # Don't start monitors when in restore mode, bubble_restore_monitor.sh will start it after algo is installed

automation/roles/bubble/files/bubble_restore_monitor.sh

@@ -111,7 +111,7 @@ CONFIGS_BACKUP=/home/bubble/.BUBBLE_ALGO_CONFIGS.tgz
 if [[ ! -f ${CONFIGS_BACKUP} ]] ; then
   log "Warning: Algo VPN configs backup not found: ${CONFIGS_BACKUP}, not installing algo"
 else
-  ALGO_BASE=/root/ansible/roles/algo/algo-master
+  ALGO_BASE=/root/ansible/roles/algo/algo
   if [[ ! -d ${ALGO_BASE} ]] ; then
     die "Error restoring Algo VPN: directory ${ALGO_BASE} not found"
   fi