Skip to content

Commit

Permalink
Merge pull request #2196 from gravitl/issue-2184
Browse files Browse the repository at this point in the history
fix path var in mosquitto.conf copy command
  • Loading branch information
0xdcarns authored Apr 12, 2023
2 parents 7c3ab41 + 0c45e38 commit b2ce1db
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions scripts/nm-upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ backup_v17_files() {
mkdir $INSTALL_PATH/netmaker_0.17.1_backup
cp $INSTALL_PATH/docker-compose.yml $INSTALL_PATH/netmaker_0.17.1_backup/docker-compose.yml
cp $INSTALL_PATH/Caddyfile $INSTALL_PATH/netmaker_0.17.1_backup/Caddyfile
cp $INSTALL_PATH/mosquitto.conf %INSTALL_PATH/netmaker_0.17.1_backup/mosquitto.conf
cp $INSTALL_PATH/mosquitto.conf $INSTALL_PATH/netmaker_0.17.1_backup/mosquitto.conf
cp $INSTALL_PATH/wait.sh $INSTALL_PATH/netmaker_0.17.1_backup/wait.sh
}

Expand All @@ -38,7 +38,7 @@ backup_volumes() {
restore_old_netmaker_instructions() {
echo "There was a problem with the installation. Your config files and volumes have been backed up."
echo "To restore Netmaker back to v0.17.1, copy all the netmaker volume backups (caddy_conf-backup, caddy_data-backup, dnsconfig-backup, mosquitto_data-backup, mosquitto_logs-backup, and sqldata-backup) back to their regular names with out the -backup."
echo "Your config files should be located in ${INSALL_PATH}/netmaker_0.17.1_backup. Simply run cp ${INSALL_PATH}/netmaker_0.17.1_backup/* . (include the .) and run docker-compose up -d."
echo "Your config files should be located in ${INSTALL_PATH}/netmaker_0.17.1_backup. Simply run cp ${INSTALL_PATH}/netmaker_0.17.1_backup/* . (include the .) and run docker-compose up -d."
echo "Your netmaker should be back to v0.17.1"
}

Expand Down Expand Up @@ -119,7 +119,7 @@ install_dependencies() {
echo "version: $(docker version)"
else
echo "Docker not found. adding to dependencies"
$dependencies += " docker.io"
dependencies+=" docker.io"
fi

${update_cmd}
Expand Down

0 comments on commit b2ce1db

Please sign in to comment.