Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
slapos
Commits
cdd718e1
Commit
cdd718e1
authored
Dec 13, 2018
by
Thomas Gambier
🚴🏼
Committed by
Romain Courteaud
Dec 17, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[backupserver] don't force ssh -6 as ssh can distinguish between IPv6 and IPv4 addresses
parent
75954ea8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
software/backupserver/software.cfg
software/backupserver/software.cfg
+1
-1
software/backupserver/template-backup-script.sh.in
software/backupserver/template-backup-script.sh.in
+1
-1
No files found.
software/backupserver/software.cfg
View file @
cdd718e1
...
@@ -68,7 +68,7 @@ mode = 0644
...
@@ -68,7 +68,7 @@ mode = 0644
[template-backup-script]
[template-backup-script]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/template-backup-script.sh.in
url = ${:_profile_base_location_}/template-backup-script.sh.in
md5sum =
19dbafa190803ecacb99c480195a5294
md5sum =
4c75f8462eaef2d8fcf24627e5f3575a
output = ${buildout:directory}/template-backup-script.sh.in
output = ${buildout:directory}/template-backup-script.sh.in
mode = 0644
mode = 0644
...
...
software/backupserver/template-backup-script.sh.in
View file @
cdd718e1
...
@@ -17,7 +17,7 @@ ${util-linux:location}/bin/flock $${:status_log}.lock \
...
@@ -17,7 +17,7 @@ ${util-linux:location}/bin/flock $${:status_log}.lock \
$${:exclude_string} \
$${:exclude_string} \
--include='$${:include}' \
--include='$${:include}' \
--exclude='**' \
--exclude='**' \
--remote-schema '${openssh-output:ssh} -
6 -
q -T -y -o "StrictHostKeyChecking no" -i $${:sshkey} -p $${:connection_port} %s $${:remote_schema}' \
--remote-schema '${openssh-output:ssh} -q -T -y -o "StrictHostKeyChecking no" -i $${:sshkey} -p $${:connection_port} %s $${:remote_schema}' \
$${:connection}::/ ./
$${:connection}::/ ./
RESULT=$?
RESULT=$?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment