Skip to content

Commit 9392a8b

Browse files
author
Shaun Sundquist
committed
removed refreences to CI/Builds backups
removed configs and refrences as CI/Builds are integrated to gitlab Issue #35
1 parent f374b8e commit 9392a8b

File tree

3 files changed

+0
-81
lines changed

3 files changed

+0
-81
lines changed

README.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,6 @@ localConfDir="/var/opt/gitlab/backups/configBackups"
8282
# you can leave this blank
8383
remoteConfDest=""
8484

85-
## Using the CI server?
86-
# change to true or 1 to enable CI backups
87-
enableCIBackup="0"
88-
89-
## $remoteServer dest for CI backups on remote
90-
ciRemoteDest="/var/opt/gitlab/ci-backups"
91-
9285
## ssh port or 873 for rsyncd port
9386
remotePort=22
9487

auto-gitlab-backup.conf.sample

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,6 @@ localConfDir="/var/opt/gitlab/backups/configBackups"
3030
# you can leave this blank
3131
remoteConfDest=""
3232

33-
## Using the CI server?
34-
# change to true or 1 to enable CI backups
35-
enableCIBackup="0"
36-
37-
## $remoteServer dest for CI backups on remote
38-
ciRemoteDest="/var/opt/gitlab/ci-backups"
39-
4033
## ssh port or 873 for rsyncd port
4134
remotePort=22
4235

auto-gitlab-backup.sh

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ PDIR=$(dirname $(readlink -f $0))
4242
dateStamp=`date +"%F %H:%m:%S"`
4343
confFile="$PDIR/auto-gitlab-backup.conf"
4444
rakeBackup="gitlab-rake gitlab:backup:create"
45-
rakeCIBackup="gitlab-ci-rake backup:create"
4645

4746
###
4847
## Functions
@@ -66,10 +65,6 @@ checkSize() {
6665
echo "Total disk space used for backup storage.."
6766
echo "Size - Location"
6867
echo `du -hs "$gitRakeBackups"`
69-
if [[ $enableCIBackup == "true" || $enableCIBackup = 1 ]]
70-
then
71-
echo `du -hs "$gitRakeCIBackups"`
72-
fi
7368
echo
7469
}
7570

@@ -93,30 +88,12 @@ rakeBackup() {
9388
$rakeBackup
9489
}
9590

96-
rakeCIBackup() {
97-
if [[ $enableCIBackup == "true" || $enableCIBackup = 1 ]]
98-
then
99-
echo ===== raking a CI backup =====
100-
cd $gitRakeCIBackups
101-
$rakeCIBackup
102-
fi
103-
}
104-
10591
rsyncUp() {
10692
# rsync up with default key
10793
echo =============================================================
10894
echo -e "Start rsync to \n$remoteServer:$remoteDest\ndefault key\n"
10995
rsync -Cavz --delete-after -e "ssh -p$remotePort" $gitRakeBackups/ $remoteUser@$remoteServer:$remoteDest
11096

111-
# rsync CI backup
112-
if [[ $enableCIBackup == "true" || $enableCIBackup = 1 ]]
113-
then
114-
echo ===== rsync a CI backup =====
115-
echo =============================================================
116-
echo -e "Start rsync to \n$remoteServer:$ciRemoteDest\ndefault key\n"
117-
rsync -Cavz --delete-after -e "ssh -p$remotePort" $gitRakeCIBackups/ $remoteUser@$remoteServer:$ciRemoteDest
118-
fi
119-
12097
# config rsync
12198
if [ ! -z $remoteConfDest ]
12299
then
@@ -133,15 +110,6 @@ rsyncUp_dryrun() {
133110
echo -e "Start dry run rsync to \n$remoteServer:$remoteDest\ndefault key\n"
134111
rsync --dry-run -Cavz --delete-after -e "ssh -p$remotePort" $gitRakeBackups/ $remoteUser@$remoteServer:$remoteDest
135112

136-
# rsync CI backup
137-
if [[ $enableCIBackup == "true" || $enableCIBackup = 1 ]]
138-
then
139-
echo ===== rsync a CI backup =====
140-
echo =============================================================
141-
echo -e "Start rsync to \n$remoteServer:$ciRemoteDest\ndefault key\n"
142-
rsync --dry-run -Cavz --delete-after -e "ssh -p$remotePort" $gitRakeCIBackups/ $remoteUser@$remoteServer:$ciRemoteDest
143-
fi
144-
145113
# config rsync
146114
if [ ! -z $remoteConfDest ]
147115
then
@@ -158,14 +126,6 @@ rsyncKey() {
158126
echo -e "Start rsync to \n$remoteServer:$remoteDest\nwith specific key\n"
159127
rsync -Cavz --delete-after -e "ssh -i $sshKeyPath -p$remotePort" $gitRakeBackups/ $remoteUser@$remoteServer:$remoteDest
160128

161-
# rsync CI backup
162-
if [[ $enableCIBackup == "true" || $enableCIBackup = 1 ]]
163-
then
164-
echo ===== rsync a CI backup =====
165-
echo -e "Start rsync to \n$remoteServer:$ciRemoteDest\nwith specific key\n"
166-
rsync -Cavz --delete-after -e "ssh -i $sshKeyPath -p$remotePort" $gitRakeCIBackups/ $remoteUser@$remoteServer:$ciRemoteDest
167-
fi
168-
169129
# config rsync
170130
if [ ! -z $remoteConfDest ]
171131
then
@@ -182,14 +142,6 @@ rsyncKey_dryrun() {
182142
echo -e "Start dry run rsync to \n$remoteServer:$remoteDest\nwith specific key\n"
183143
rsync --dry-run -Cavz --delete-after -e "ssh -i $sshKeyPath -p$remotePort" $gitRakeBackups/ $remoteUser@$remoteServer:$remoteDest
184144

185-
# rsync CI backup
186-
if [[ $enableCIBackup == "true" || $enableCIBackup = 1 ]]
187-
then
188-
echo ===== rsync a CI backup =====
189-
echo -e "Start rsync to \n$remoteServer:$ciRemoteDest\nwith specific key\n"
190-
rsync --dry-run -Cavz --delete-after -e "ssh -i $sshKeyPath -p$remotePort" $gitRakeCIBackups/ $remoteUser@$remoteServer:$ciRemoteDest
191-
fi
192-
193145
# config rsync
194146
if [ ! -z $remoteConfDest ]
195147
then
@@ -207,15 +159,6 @@ rsyncDaemon() {
207159
echo -e "Start rsync to \n$remoteUser@$remoteServer:$remoteModule\nin daemon mode\n"
208160
rsync -Cavz --port=$remotePort --password-file=$rsync_password_file --delete-after /$gitRakeBackups/ $remoteUser@$remoteServer::$remoteModule
209161

210-
# rsync CI backup
211-
if [[ $enableCIBackup == "true" || $enableCIBackup = 1 ]]
212-
then
213-
echo ===== rsync a CI backup =====
214-
echo =============================================================
215-
echo -e "Start rsync to \n$remoteUser@$remoteServer:$remoteCIModule\nin daemon mode\n"
216-
rsync -Cavz --port=$remotePort --password-file=$rsync_password_file --delete-after /$gitRakeCIBackups/ $remoteUser@$remoteServer::$remoteCIModule
217-
fi
218-
219162
# config rsync
220163
if [ ! -z $remoteConfDest ]
221164
then
@@ -232,15 +175,6 @@ rsyncDaemon_dryrun() {
232175
echo -e "Start rsync to \n$remoteUser@$remoteServer:$remoteModule\nin daemon mode\n"
233176
rsync --dry-run -Cavz --port=$remotePort --password-file=$rsync_password_file --delete-after /$gitRakeBackups/ $remoteUser@$remoteServer::$remoteModule
234177

235-
# rsync CI backup
236-
if [[ $enableCIBackup == "true" || $enableCIBackup = 1 ]]
237-
then
238-
echo ===== rsync a CI backup =====
239-
echo =============================================================
240-
echo -e "Start rsync to \n$remoteUser@$remoteServer:$remoteCIModule\nin daemon mode\n"
241-
rsync --dry-run -Cavz --port=$remotePort --password-file=$rsync_password_file --delete-after /$gitRakeCIBackups/ $remoteUser@$remoteServer::$remoteCIModule
242-
fi
243-
244178
# config rsync
245179
if [ ! -z $remoteConfDest ]
246180
then
@@ -352,7 +286,6 @@ case $1 in
352286
confFileExist
353287
# perform backup
354288
rakeBackup
355-
rakeCIBackup
356289
archiveConfig
357290
checkSize
358291
# go back to where we came from

0 commit comments

Comments
 (0)