1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
|
--- ./bin/tartarus.orig 2014-06-28 01:35:27.535761589 +0200
+++ ./bin/tartarus 2014-06-28 01:38:03.361776923 +0200
@@ -41,6 +41,8 @@
set -f
shopt -s nocasematch
+typeset -x PATH=/usr/local/bin:/usr/local/sbin:${PATH}
+
CMD_INCREMENTAL="no"
CMD_UPDATE="no"
PROFILE=""
@@ -527,7 +529,7 @@
#
# Disabling this option will stop Tartarus from checking its website for updates
# of itself.
-CHECK_FOR_UPDATE="yes"
+CHECK_FOR_UPDATE="no"
#
#=item FILE_LIST_CREATION
#
@@ -540,6 +542,37 @@
# This defines the directory lists of the processed files are placed in.
FILE_LIST_DIRECTORY=""
#
+#=item SFTP_AUTH_METHOD
+#
+# Defines SFTP authentication method: can be "password" or "pubkey"
+SFTP_AUTH_METHOD="password"
+#
+#=item SFTP_AUTH_PRIVKEY
+#
+# Defines SSH private key for authentication
+SFTP_AUTH_PRIVKEY=""
+#
+#=item SFTP_AUTH_PUBKEY
+#
+# Defines SSH public key for authentication
+SFTP_AUTH_PUBKEY=""
+#
+#=item SFTP_AUTH_PRIVKEY_TYPE
+#
+# Defines SSH private key type (PEM|DER|ENG)A
+# Defaults to PEM
+SFTP_AUTH_PRIVKEY_TYPE="PEM"
+#
+#=item SFTP_AUTH_PRIVKEY_PASS
+#
+# Defines SFTP_AUTH_PRIVKEY passphrase
+SFTP_AUTH_PRIVKEY_PASS=""
+#
+#=item SFTP_AUTH_HOSTPUBMD5
+#
+# Defines SFTP host MD5 pubkey
+SFTP_AUTH_HOSTPUBMD5=""
+#
#=back
#
#=cut
@@ -638,10 +671,10 @@
case "$ASSEMBLY_METHOD" in
tar|"")
# use the traditional tar setup
- requireCommand tar || cleanup 1
+ requireCommand gtar || cleanup 1
collate() {
local TAROPTS="--no-unquote --no-recursion $TAR_OPTIONS"
- call tar cpf - $TAROPTS --null -T -
+ call gtar cpf - $TAROPTS --null -T -
local EXITCODE=$?
# exit code 1 means that some files have changed while backing them
# up, we think that is OK for now
@@ -678,17 +711,24 @@
# define storage procedure
storage() {
# stay silent, but print error messages if aborting
- local OPTS="-u $STORAGE_FTP_USER:$STORAGE_FTP_PASSWORD -s -S"
- if isEnabled "$STORAGE_FTP_USE_SSL"; then
- OPTS="$OPTS --ftp-ssl"
- fi
- if isEnabled "$STORAGE_FTP_SSL_INSECURE"; then
- OPTS="$OPTS -k"
- fi
+ local OPTS="-s -S -u $STORAGE_FTP_USER:"
local PROTO="ftp"
- if isEnabled "$STORAGE_FTP_USE_SFTP"; then
- PROTO="sftp"
- fi
+ [ "$SFTP_AUTH_METHOD" != "pubkey" && "$STORAGE_FTP_PASSWORD" != "" ] && OPTS="${OPTS}${STORAGE_FTP_PASSWORD}"
+ if isEnabled "$STORAGE_FTP_USE_SFTP"; then
+ PROTO="sftp"
+ if isEnabled "$STORAGE_FTP_SSL_INSECURE"; then
+ OPTS="$OPTS -k"
+ fi
+ [ "$SFTP_AUTH_PRIVKEY" != "" ] && OPTS="$OPTS --key $SFTP_AUTH_PRIVKEY"
+ [ "$SFTP_AUTH_PUBKEY" != "" ] && OPTS="$OPTS --pubkey $SFTP_AUTH_PUBKEY"
+ [ "$SFTP_AUTH_PRIVKEY_TYPE" != "" ] && OPTS="$OPTS --key-type $SFTP_AUTH_PRIVKEY_TYPE"
+ [ "$SFTP_AUTH_PRIVKEY_PASS" != "" ] && OPTS="$OPTS --pass $SFTP_AUTH_PRIVKEY_PASS"
+ [ "$SFTP_AUTH_HOSTPUBMD5" != "" ] && OPTS="$OPTS --hostpubmd5 $SFTP_AUTH_HOSTPUBMD5"
+ else
+ if isEnabled "$STORAGE_FTP_USE_SSL"; then
+ OPTS="$OPTS --ftp-ssl"
+ fi
+ fi
local FILE=$(constructFilename)
local URL="$PROTO://$STORAGE_FTP_SERVER/$STORAGE_FTP_DIR/$FILE"
debug "Uploading backup to $URL..."
|
