From 7b998d1dd0a66cfacaf8aa48ea02b15dba254251 Mon Sep 17 00:00:00 2001 From: Dirkjan Bussink Date: Mon, 25 Jul 2016 12:02:27 +0200 Subject: [PATCH] Remove restoring cluster.conf on restore (#53) This breaks restoring in a differently layed out cluster which is explicitly supported. --- share/github-backup-utils/ghe-restore-settings | 6 ------ 1 file changed, 6 deletions(-) diff --git a/share/github-backup-utils/ghe-restore-settings b/share/github-backup-utils/ghe-restore-settings index 89aa934b4..a0ac361f4 100755 --- a/share/github-backup-utils/ghe-restore-settings +++ b/share/github-backup-utils/ghe-restore-settings @@ -51,12 +51,6 @@ if [ -f "$GHE_RESTORE_SNAPSHOT_PATH/manage-password" ]; then ghe-ssh "$GHE_HOSTNAME" -- "ghe-import-passwords" fi -if [ "$GHE_BACKUP_STRATEGY" = "cluster" ]; then - echo "Restoring cluster configuration ..." - cat "$GHE_RESTORE_SNAPSHOT_PATH/cluster.conf" | - ghe-ssh "$GHE_HOSTNAME" -- "sudo tee $GHE_REMOTE_CLUSTER_CONF_FILE >/dev/null" -fi - # Restore SAML keys if present. if [ -f "$GHE_RESTORE_SNAPSHOT_PATH/saml-keys.tar" ]; then echo "Restoring SAML keys ..."