do not save aws and backupKey
it is now part of backupConfig
This commit is contained in:
@@ -16,8 +16,6 @@ arg_tls_key=""
|
|||||||
arg_token=""
|
arg_token=""
|
||||||
arg_version=""
|
arg_version=""
|
||||||
arg_web_server_origin=""
|
arg_web_server_origin=""
|
||||||
arg_backup_key=""
|
|
||||||
arg_aws=""
|
|
||||||
arg_backup_config=""
|
arg_backup_config=""
|
||||||
arg_dns_config=""
|
arg_dns_config=""
|
||||||
|
|
||||||
@@ -45,12 +43,6 @@ EOF
|
|||||||
arg_restore_key=$(echo "$2" | $json restore.key)
|
arg_restore_key=$(echo "$2" | $json restore.key)
|
||||||
[[ "${arg_restore_key}" == "null" ]] && arg_restore_key=""
|
[[ "${arg_restore_key}" == "null" ]] && arg_restore_key=""
|
||||||
|
|
||||||
arg_backup_key=$(echo "$2" | $json backupKey)
|
|
||||||
[[ "${arg_backup_key}" == "null" ]] && arg_backup_key=""
|
|
||||||
|
|
||||||
arg_aws=$(echo "$2" | $json aws)
|
|
||||||
[[ "${arg_aws}" == "null" ]] && arg_aws=""
|
|
||||||
|
|
||||||
arg_backup_config=$(echo "$2" | $json backupConfig)
|
arg_backup_config=$(echo "$2" | $json backupConfig)
|
||||||
[[ "${arg_backup_config}" == "null" ]] && arg_backup_config=""
|
[[ "${arg_backup_config}" == "null" ]] && arg_backup_config=""
|
||||||
|
|
||||||
|
|||||||
@@ -124,7 +124,6 @@ set_progress "65" "Creating cloudron.conf"
|
|||||||
sudo -u yellowtent -H bash <<EOF
|
sudo -u yellowtent -H bash <<EOF
|
||||||
set -eu
|
set -eu
|
||||||
echo "Creating cloudron.conf"
|
echo "Creating cloudron.conf"
|
||||||
# note that arg_aws is a javascript object and intentionally unquoted below
|
|
||||||
cat > "${CONFIG_DIR}/cloudron.conf" <<CONF_END
|
cat > "${CONFIG_DIR}/cloudron.conf" <<CONF_END
|
||||||
{
|
{
|
||||||
"version": "${arg_version}",
|
"version": "${arg_version}",
|
||||||
@@ -141,9 +140,7 @@ cat > "${CONFIG_DIR}/cloudron.conf" <<CONF_END
|
|||||||
"password": "${mysql_root_password}",
|
"password": "${mysql_root_password}",
|
||||||
"port": 3306,
|
"port": 3306,
|
||||||
"name": "box"
|
"name": "box"
|
||||||
},
|
}
|
||||||
"backupKey": "${arg_backup_key}",
|
|
||||||
"aws": ${arg_aws}
|
|
||||||
}
|
}
|
||||||
CONF_END
|
CONF_END
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user