Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
envsetup
Manage
Activity
Members
Plan
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mediaserver
envsetup
Commits
79e2b12a
Commit
79e2b12a
authored
7 years ago
by
Florent Thiery
Browse files
Options
Downloads
Patches
Plain Diff
use BACKUP_SERVER instead of BURP_SERVER (deprecated) refs
#20367
parent
79cdb011
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
global-conf.sh
+3
-0
3 additions, 0 deletions
global-conf.sh
tests/test_backup.py
+6
-6
6 additions, 6 deletions
tests/test_backup.py
with
9 additions
and
6 deletions
global-conf.sh
+
3
−
0
View file @
79e2b12a
...
...
@@ -108,6 +108,9 @@ BURP_MAIL_DEST='sysadmin@ubicast.eu'
BURP_CLIENT_NAME
=
BURP_CLIENT_MAIL_DEST
=
'sysadmin@ubicast.eu'
# -- tmbackup
BACKUP_SERVER
=
''
# -- FTP --
# move uploaded files into hotfolder
# login:pass CSV separated
...
...
This diff is collapsed.
Click to expand it.
tests/test_backup.py
+
6
−
6
View file @
79e2b12a
...
...
@@ -71,21 +71,21 @@ os.chdir(os.path.dirname(__file__))
if
os
.
path
.
isfile
(
'
../utils.py
'
):
es_utils
=
imp
.
load_source
(
'
es_utils
'
,
'
../utils.py
'
)
conf
=
es_utils
.
load_conf
()
BU
R
P_SERVER
=
conf
.
get
(
'
BU
R
P_SERVER
'
)
if
BU
R
P_SERVER
:
if
not
test_ssh
(
BU
R
P_SERVER
):
B
ACK
UP_SERVER
=
conf
.
get
(
'
B
ACK
UP_SERVER
'
)
if
B
ACK
UP_SERVER
:
if
not
test_ssh
(
B
ACK
UP_SERVER
):
print
(
'
Failed to ssh into backup server
'
)
sys
.
exit
(
1
)
else
:
if
not
test_last_backup_is_recent
(
BU
R
P_SERVER
):
if
not
test_last_backup_is_recent
(
B
ACK
UP_SERVER
):
sys
.
exit
(
1
)
else
:
if
not
test_backup_space
(
BU
R
P_SERVER
):
if
not
test_backup_space
(
B
ACK
UP_SERVER
):
sys
.
exit
(
1
)
else
:
sys
.
exit
(
0
)
else
:
print
(
'
No BU
R
P_SERVER defined in config, untestable
'
)
print
(
'
No B
ACK
UP_SERVER defined in config, untestable
'
)
sys
.
exit
(
2
)
else
:
print
(
'
Unable to load config, untestable
'
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment