Only set backupConfig in setup when no restore key is provided

When a restore is performed, the backupConfig is part of the
backup. Otherwise provide a default file based config which
contains the encryption key
This commit is contained in:
Johannes
2016-11-20 18:17:53 +01:00
parent 1b291365d5
commit 51799f7f14
+21 -8
View File
@@ -104,15 +104,12 @@ fi
echo "=> Run base init service"
systemctl start cloudron-system-setup
data=$(cat <<EOF
if [[ -z "${restoreUrl}" ]]; then
data=$(cat <<EOF
{
"boxVersionsUrl": "${versionsUrl}",
"fqdn": "${domain}",
"provider": "${provider}",
"restore": {
"url": "${restoreUrl}",
"key": "${encryptionKey}"
},
"provider": "${provider}"
"tlsConfig": {
"provider": "${tlsProvider}"
},
@@ -123,8 +120,24 @@ data=$(cat <<EOF
},
"version": "${version}"
}
EOF
)
EOF)
else
data=$(cat <<EOF
{
"boxVersionsUrl": "${versionsUrl}",
"fqdn": "${domain}",
"provider": "${provider}",
"restore": {
"url": "${restoreUrl}",
"key": "${encryptionKey}"
},
"tlsConfig": {
"provider": "${tlsProvider}"
}
"version": "${version}"
}
EOF)
fi
echo "=> Run installer.sh for version ${version} with ${sourceTarballUrl} ... (this takes some time)"
if ! ${INSTALLER_SOURCE_DIR}/scripts/installer.sh --sourcetarballurl "${sourceTarballUrl}" --data "${data}" &>> "${LOG_FILE}"; then