Skip to content

Commit 10fa9dd

Browse files
committed
add requirements file
1 parent e6aa5aa commit 10fa9dd

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

bin/ghe-host-check

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,14 @@ if [ -z "$supported" ]; then
144144
exit 1
145145
fi
146146

147+
# Bring in the requirements file
148+
. "$(dirname "${BASH_SOURCE[0]}")/../share/github-backup-utils/requirements.txt"
149+
147150
#Display dir requirements for repositories and mysql
148151
backup_dir=${GHE_DATA_DIR}
149152
available_space=$(df $backup_dir | awk 'END{print $4}')
150153
repo_disk_size=$(ghe-ssh "$host" sudo du -sh /data/user/repositories | awk '{print $1}')
151-
mysql_disk_size=$(ghe-ssh "$host" sudo du -sh /data/user/mysql | awk '{print $1}')
154+
#mysql_disk_size=$(ghe-ssh "$host" sudo du -sh /data/user/mysql | awk '{print $1}')
152155
# Convert the data size to kilobytes
153156
case "$repo_disk_size" in
154157
*T) repo_disk_size=$(( $(echo "$repo_disk_size" | sed 's/T/000000000/') )) ;;
@@ -163,24 +166,24 @@ fi
163166

164167
#Check rsync, openssh & jq versions
165168
rsync_version=$(rsync --version | grep 'version' | awk '{print $3}')
166-
if awk "BEGIN {exit !($rsync_version < 2.6.4)}" &> /dev/null; then
169+
if awk "BEGIN {exit !($rsync_version < $min_rsync)}" &> /dev/null; then
167170
echo "rsync version $rsync_version in backup-host does not meet minimum requirements."
168-
echo "Please make sure you have the minimum required version of rsync installed"
169-
exit 2
171+
echo "Please make sure you have the minimum required version of rsync: "$min_rsync" installed"
172+
exit 1
170173
fi
171174

172175
ssh_version=$(ssh -V 2>&1 | awk '{print $1}'|grep -oPm 1 '[\d\.]+' |head -1)
173-
if awk "BEGIN {exit !($ssh_version < 5.6)}" &> /dev/null; then
176+
if awk "BEGIN {exit !($ssh_version < $min_openssh)}" &> /dev/null; then
174177
echo "openSSH version $ssh_version in backup-host does not meet minimum requirements."
175-
echo "Please make sure the minimum required version of openSSH is installed"
176-
exit 2
178+
echo "Please make sure the minimum required version of openSSH: "$min_openssh" is installed"
179+
exit 1
177180
fi
178181

179182
jq_version=$(jq --version |awk -F\- '{print $2}')
180-
if awk "BEGIN {exit !($jq_version < 1.5)}" &> /dev/null; then
183+
if awk "BEGIN {exit !($jq_version < $min_jq)}" &> /dev/null; then
181184
echo "jq version $jq_version in backup-host does not meet minimum requirements."
182-
echo "Please make sure you have the minimum required version of jq installed"
183-
exit 2
185+
echo "Please make sure you have the minimum required version of jq: "$min_jq" installed"
186+
exit 1
184187
fi
185188

186189

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
min_rsync=2.6.4
2+
min_openssh=5.6
3+
min_jq=1.5

0 commit comments

Comments
 (0)