Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
backupninja
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
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
lyz
backupninja
Commits
f9672647
Commit
f9672647
authored
15 years ago
by
intrigeri
Browse files
Options
Downloads
Patches
Plain Diff
ldap, mysql, pgsql: use gzip's --rsyncable option
parent
75d17d06
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
ChangeLog
+5
-0
5 additions, 0 deletions
ChangeLog
handlers/ldap.in
+1
-1
1 addition, 1 deletion
handlers/ldap.in
handlers/mysql.in
+2
-2
2 additions, 2 deletions
handlers/mysql.in
handlers/pgsql.in
+4
-4
4 additions, 4 deletions
handlers/pgsql.in
with
12 additions
and
7 deletions
ChangeLog
+
5
−
0
View file @
f9672647
...
@@ -6,6 +6,8 @@ version 0.9.7 -- UNRELEASED
...
@@ -6,6 +6,8 @@ version 0.9.7 -- UNRELEASED
file or in a given backup action file. Thanks Tuomas Jormola for the
file or in a given backup action file. Thanks Tuomas Jormola for the
preliminary patch (Closes: #511299)
preliminary patch (Closes: #511299)
handler changes
handler changes
ldap:
. Use gzip's --rsyncable option.
maildir:
maildir:
. fix location of deleted_on file
. fix location of deleted_on file
. add missing destid_file options to ssh connections
. add missing destid_file options to ssh connections
...
@@ -20,6 +22,9 @@ version 0.9.7 -- UNRELEASED
...
@@ -20,6 +22,9 @@ version 0.9.7 -- UNRELEASED
does not prevent mysqldump to work.
does not prevent mysqldump to work.
. Fix the error message displayed when mysqld is not running:
. Fix the error message displayed when mysqld is not running:
mysqladmin ping indeed returns 0 when authentication fails.
mysqladmin ping indeed returns 0 when authentication fails.
. Use gzip's --rsyncable option.
pgsql:
. Use gzip's --rsyncable option.
sys:
sys:
. New luksheaders option (default=disabled) to backup the Luks header
. New luksheaders option (default=disabled) to backup the Luks header
of every Luks device.
of every Luks device.
...
...
This diff is collapsed.
Click to expand it.
handlers/ldap.in
+
1
−
1
View file @
f9672647
...
@@ -86,7 +86,7 @@ if [ "$ldif" == "yes" ]; then
...
@@ -86,7 +86,7 @@ if [ "$ldif" == "yes" ]; then
fi
fi
if
[
"
$compress
"
==
"yes"
]
;
then
if
[
"
$compress
"
==
"yes"
]
;
then
execstr
=
"
$execstr
|
$GZIP
>
$dumpdir
/
$dbsuffix
.ldif.gz"
execstr
=
"
$execstr
|
$GZIP
--rsyncable
>
$dumpdir
/
$dbsuffix
.ldif.gz"
else
else
execstr
=
"
$execstr
>
$dumpdir
/
$dbsuffix
.ldif"
execstr
=
"
$execstr
>
$dumpdir
/
$dbsuffix
.ldif"
fi
fi
...
...
This diff is collapsed.
Click to expand it.
handlers/mysql.in
+
2
−
2
View file @
f9672647
...
@@ -272,7 +272,7 @@ then
...
@@ -272,7 +272,7 @@ then
fatal
"mysqld doesn't appear to be running!"
fatal
"mysqld doesn't appear to be running!"
fi
fi
if
[
"
$compress
"
==
"yes"
]
;
then
if
[
"
$compress
"
==
"yes"
]
;
then
execstr
=
"
$VSERVER
$vsname
exec
$DUMP
|
$GZIP
>
$vroot$dumpdir
/
${
db
}
.sql.gz"
execstr
=
"
$VSERVER
$vsname
exec
$DUMP
|
$GZIP
--rsyncable
>
$vroot$dumpdir
/
${
db
}
.sql.gz"
else
else
execstr
=
"
$VSERVER
$vsname
exec
$DUMP
-r
$vroot$dumpdir
/
${
db
}
.sql"
execstr
=
"
$VSERVER
$vsname
exec
$DUMP
-r
$vroot$dumpdir
/
${
db
}
.sql"
fi
fi
...
@@ -283,7 +283,7 @@ then
...
@@ -283,7 +283,7 @@ then
fatal
"mysqld doesn't appear to be running!"
fatal
"mysqld doesn't appear to be running!"
fi
fi
if
[
"
$compress
"
==
"yes"
]
;
then
if
[
"
$compress
"
==
"yes"
]
;
then
execstr
=
"
$DUMP
|
$GZIP
>
$dumpdir
/
${
db
}
.sql.gz"
execstr
=
"
$DUMP
|
$GZIP
--rsyncable
>
$dumpdir
/
${
db
}
.sql.gz"
else
else
execstr
=
"
$DUMP
-r
$dumpdir
/
${
db
}
.sql"
execstr
=
"
$DUMP
-r
$dumpdir
/
${
db
}
.sql"
fi
fi
...
...
This diff is collapsed.
Click to expand it.
handlers/pgsql.in
+
4
−
4
View file @
f9672647
...
@@ -75,13 +75,13 @@ chmod 700 $vroot$backupdir
...
@@ -75,13 +75,13 @@ chmod 700 $vroot$backupdir
if
[
"
$databases
"
==
"all"
]
;
then
if
[
"
$databases
"
==
"all"
]
;
then
if
[
$usevserver
=
yes
]
;
then
if
[
$usevserver
=
yes
]
;
then
if
[
"
$compress
"
==
"yes"
]
;
then
if
[
"
$compress
"
==
"yes"
]
;
then
execstr
=
"
$VSERVER
$vsname
exec su -
$PGSQLUSER
-c
\"
$PGSQLDUMPALL
|
$GZIP
>
$backupdir
/
${
vsname
}
.sql.gz
\"
"
execstr
=
"
$VSERVER
$vsname
exec su -
$PGSQLUSER
-c
\"
$PGSQLDUMPALL
|
$GZIP
--rsyncable
>
$backupdir
/
${
vsname
}
.sql.gz
\"
"
else
else
execstr
=
"
$VSERVER
$vsname
exec su -
$PGSQLUSER
-c
\"
$PGSQLDUMPALL
>
$backupdir
/
${
vsname
}
.sql
\"
"
execstr
=
"
$VSERVER
$vsname
exec su -
$PGSQLUSER
-c
\"
$PGSQLDUMPALL
>
$backupdir
/
${
vsname
}
.sql
\"
"
fi
fi
else
else
if
[
"
$compress
"
==
"yes"
]
;
then
if
[
"
$compress
"
==
"yes"
]
;
then
execstr
=
"su -
$PGSQLUSER
-c
\"
$PGSQLDUMPALL
|
$GZIP
>
$backupdir
/
${
localhost
}
-all.sql.gz
\"
"
execstr
=
"su -
$PGSQLUSER
-c
\"
$PGSQLDUMPALL
|
$GZIP
--rsyncable
>
$backupdir
/
${
localhost
}
-all.sql.gz
\"
"
else
else
execstr
=
"su -
$PGSQLUSER
-c
\"
$PGSQLDUMPALL
>
$backupdir
/
${
localhost
}
-all.sql
\"
"
execstr
=
"su -
$PGSQLUSER
-c
\"
$PGSQLDUMPALL
>
$backupdir
/
${
localhost
}
-all.sql
\"
"
fi
fi
...
@@ -104,13 +104,13 @@ else
...
@@ -104,13 +104,13 @@ else
for
db
in
$databases
;
do
for
db
in
$databases
;
do
if
[
$usevserver
=
yes
]
;
then
if
[
$usevserver
=
yes
]
;
then
if
[
"
$compress
"
==
"yes"
]
;
then
if
[
"
$compress
"
==
"yes"
]
;
then
execstr
=
"
$VSERVER
$vsname
exec su -
$PGSQLUSER
-c
\"
$PGSQLDUMP
$db
|
$GZIP
>
$backupdir
/
${
db
}
.sql.gz
\"
"
execstr
=
"
$VSERVER
$vsname
exec su -
$PGSQLUSER
-c
\"
$PGSQLDUMP
$db
|
$GZIP
--rsyncable
>
$backupdir
/
${
db
}
.sql.gz
\"
"
else
else
execstr
=
"
$VSERVER
$vsname
exec su -
$PGSQLUSER
-c
\"
$PGSQLDUMP
$db
| >
$backupdir
/
${
db
}
.sql
\"
"
execstr
=
"
$VSERVER
$vsname
exec su -
$PGSQLUSER
-c
\"
$PGSQLDUMP
$db
| >
$backupdir
/
${
db
}
.sql
\"
"
fi
fi
else
else
if
[
"
$compress
"
==
"yes"
]
;
then
if
[
"
$compress
"
==
"yes"
]
;
then
execstr
=
"su -
$PGSQLUSER
-c
\"
$PGSQLDUMP
$db
|
$GZIP
>
$backupdir
/
${
db
}
.sql.gz
\"
"
execstr
=
"su -
$PGSQLUSER
-c
\"
$PGSQLDUMP
$db
|
$GZIP
--rsyncable
>
$backupdir
/
${
db
}
.sql.gz
\"
"
else
else
execstr
=
"su -
$PGSQLUSER
-c
\"
$PGSQLDUMP
$db
>
$backupdir
/
${
db
}
.sql
\"
"
execstr
=
"su -
$PGSQLUSER
-c
\"
$PGSQLDUMP
$db
>
$backupdir
/
${
db
}
.sql
\"
"
fi
fi
...
...
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