Skip to content

Commit 58568a4

Browse files
tyliectyliec
committed
t
1 parent 7fee9a2 commit 58568a4

11 files changed

+16
-28
lines changed

‎share/github-backup-utils/ghe-backup-git-hooks

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if [ "$GHE_BACKUP_STRATEGY" = "cluster" ]; then
4343
ssh_config_file="$tempdir/ssh_config"
4444
ssh_config_file_opt="-F $ssh_config_file"
4545
opts="$opts -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
46-
hostnames=$(ghe-cluster-nodes "$GHE_HOSTNAME" "git-server")
46+
hostnames=$(ghe-cluster-find-nodes "$GHE_HOSTNAME" "git-server")
4747
ghe-ssh-config "$GHE_HOSTNAME" "$hostnames" > "$ssh_config_file"
4848
fi
4949

‎share/github-backup-utils/ghe-backup-pages

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if [ "$GHE_BACKUP_STRATEGY" = "cluster" ]; then
4343
ssh_config_file="$tempdir/ssh_config"
4444
ssh_config_file_opt="-F $ssh_config_file"
4545
opts="$opts -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
46-
hostnames=$(ghe-cluster-nodes "$GHE_HOSTNAME" "pages-server")
46+
hostnames=$(ghe-cluster-find-nodes "$GHE_HOSTNAME" "pages-server")
4747
ghe-ssh-config "$GHE_HOSTNAME" "$hostnames" > "$ssh_config_file"
4848
fi
4949

‎share/github-backup-utils/ghe-backup-repositories

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ if [ "$GHE_BACKUP_STRATEGY" = "cluster" ]; then
7474
ssh_config_file="$tempdir/ssh_config"
7575
ssh_config_file_opt="-F $ssh_config_file"
7676
opts="$opts -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
77-
hostnames=$(ghe-cluster-nodes "$GHE_HOSTNAME" "git-server")
77+
hostnames=$(ghe-cluster-find-nodes "$GHE_HOSTNAME" "git-server")
7878
ghe-ssh-config "$GHE_HOSTNAME" "$hostnames" > "$ssh_config_file"
7979
fi
8080

‎share/github-backup-utils/ghe-backup-storage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if [ "$GHE_BACKUP_STRATEGY" = "cluster" ]; then
4747
ssh_config_file="$tempdir/ssh_config"
4848
ssh_config_file_opt="-F $ssh_config_file"
4949
opts="$opts -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
50-
hostnames=$(ghe-cluster-nodes "$GHE_HOSTNAME" "storage-server")
50+
hostnames=$(ghe-cluster-find-nodes "$GHE_HOSTNAME" "storage-server")
5151
ghe-ssh-config "$GHE_HOSTNAME" "$hostnames" > "$ssh_config_file"
5252
fi
5353

‎share/github-backup-utils/ghe-cluster-nodes renamed to ‎share/github-backup-utils/ghe-cluster-find-nodes

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
#/ Usage: ghe-cluster-nodes <host> <prefix>
2+
#/ Usage: ghe-cluster-find-nodes <host> <prefix>
33
#/
44
#/ Finds all nodes of the cluster using the config on <host>.
55
#/ If it is a 2.8 and later cluster version the results are returned as
@@ -28,19 +28,7 @@ prefix="$2"
2828
role=$(echo "$prefix" | cut -d '-' -f1)
2929

3030
if ghe-ssh "$GHE_HOSTNAME" test -f $GHE_REMOTE_ROOT_DIR/etc/github/cluster; then
31-
test_output=$(ghe-ssh "GHE_HOSTNAME" ls -lah /)
32-
echo $test_output
33-
34-
test_output=$(ghe-ssh "GHE_HOSTNAME" ls -lah /usr/local/bin)
35-
echo $test_output
36-
37-
test_output=$(ghe-ssh "GHE_HOSTNAME" whereis ghe-cluster-each)
38-
echo $test_output
39-
40-
test_output=$(ghe-ssh "GHE_HOSTNAME" whereis ghe-cluster-nodes)
41-
echo $test_output
42-
43-
node_uuids=$(ghe-ssh "$GHE_HOSTNAME" /usr/local/bin/ghe-cluster-nodes -r "$role" -u | cut -f 2)
31+
node_uuids=$(ghe-ssh "$GHE_HOSTNAME" ghe-cluster-nodes -r "$role" -u | cut -f 2)
4432
hostnames=''
4533
for uuid in $node_uuids; do
4634
hostnames+="$prefix-$uuid "

‎share/github-backup-utils/ghe-restore-git-hooks

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ if $CLUSTER; then
4242
ssh_config_file="$tempdir/ssh_config"
4343
ssh_config_file_opt="-F $ssh_config_file"
4444
opts="$opts -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
45-
hostnames=$(ghe-cluster-nodes "$GHE_HOSTNAME" "git-server")
45+
hostnames=$(ghe-cluster-find-nodes "$GHE_HOSTNAME" "git-server")
4646
ghe-ssh-config "$GHE_HOSTNAME" "$hostnames" > "$ssh_config_file"
4747
fi
4848

‎share/github-backup-utils/ghe-restore-pages

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ if $CLUSTER; then
5656
ssh_config_file="$tempdir/ssh_config"
5757
ssh_config_file_opt="-F $ssh_config_file"
5858
opts="$opts -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
59-
hostnames=$(ghe-cluster-nodes "$GHE_HOSTNAME" "pages-server")
59+
hostnames=$(ghe-cluster-find-nodes "$GHE_HOSTNAME" "pages-server")
6060
ghe-ssh-config "$GHE_HOSTNAME" "$hostnames" > "$ssh_config_file"
6161
fi
6262

‎share/github-backup-utils/ghe-restore-repositories

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ if $CLUSTER; then
6161
ssh_config_file="$tempdir/ssh_config"
6262
ssh_config_file_opt="-F $ssh_config_file"
6363
opts="$opts -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
64-
hostnames=$(ghe-cluster-nodes "$GHE_HOSTNAME" "git-server")
64+
hostnames=$(ghe-cluster-find-nodes "$GHE_HOSTNAME" "git-server")
6565
ghe-ssh-config "$GHE_HOSTNAME" "$hostnames" > "$ssh_config_file"
6666
fi
6767

‎share/github-backup-utils/ghe-restore-repositories-gist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ if $CLUSTER; then
6060
ssh_config_file="$tempdir/ssh_config"
6161
ssh_config_file_opt="-F $ssh_config_file"
6262
opts="$opts -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
63-
hostnames=$(ghe-cluster-nodes "$GHE_HOSTNAME" "git-server")
63+
hostnames=$(ghe-cluster-find-nodes "$GHE_HOSTNAME" "git-server")
6464
ghe-ssh-config "$GHE_HOSTNAME" "$hostnames" > "$ssh_config_file"
6565
fi
6666

‎share/github-backup-utils/ghe-restore-storage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ if $CLUSTER; then
6060
ssh_config_file="$tempdir/ssh_config"
6161
ssh_config_file_opt="-F $tempdir/ssh_config"
6262
opts="$opts -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
63-
hostnames=$(ghe-cluster-nodes "$GHE_HOSTNAME" "storage-server")
63+
hostnames=$(ghe-cluster-find-nodes "$GHE_HOSTNAME" "storage-server")
6464
ghe-ssh-config "$GHE_HOSTNAME" "$hostnames" > "$ssh_config_file"
6565
fi
6666

0 commit comments

Comments
 (0)