cloudron-setup: tls-provider is obsolete

This commit is contained in:
Girish Ramakrishnan
2018-01-31 20:10:47 -08:00
parent 8014cc8ae1
commit d915ea348f
2 changed files with 4 additions and 28 deletions

View File

@@ -45,7 +45,6 @@ fi
initBaseImage="true"
# provisioning data
provider=""
tlsProvider="letsencrypt-prod"
requestedVersion=""
apiServerOrigin="https://api.cloudron.io"
webServerOrigin="https://cloudron.io"
@@ -54,25 +53,22 @@ sourceTarballUrl=""
rebootServer="true"
baseDataDir=""
args=$(getopt -o "" -l "help,skip-baseimage-init,data-dir:,provider:,tls-provider:,version:,dns-provider:,env:,prerelease,skip-reboot,source-url:" -n "$0" -- "$@")
args=$(getopt -o "" -l "help,skip-baseimage-init,data-dir:,provider:,version:,dns-provider:,env:,prerelease,skip-reboot,source-url:" -n "$0" -- "$@")
eval set -- "${args}"
while true; do
case "$1" in
--help) echo "See https://cloudron.io/documentation/installation/ on how to install Cloudron"; exit 0;;
--provider) provider="$2"; shift 2;;
--tls-provider) tlsProvider="$2"; shift 2;;
--version) requestedVersion="$2"; shift 2;;
--env)
if [[ "$2" == "dev" ]]; then
apiServerOrigin="https://api.dev.cloudron.io"
webServerOrigin="https://dev.cloudron.io"
tlsProvider="letsencrypt-staging"
prerelease="true"
elif [[ "$2" == "staging" ]]; then
apiServerOrigin="https://api.staging.cloudron.io"
webServerOrigin="https://staging.cloudron.io"
tlsProvider="letsencrypt-staging"
prerelease="true"
fi
shift 2;;
@@ -111,11 +107,6 @@ elif [[ \
exit 1
fi
if [[ "${tlsProvider}" != "fallback" && "${tlsProvider}" != "letsencrypt-prod" && "${tlsProvider}" != "letsencrypt-staging" ]]; then
echo "--tls-provider must be one of: letsencrypt-prod, letsencrypt-staging, fallback"
exit 1
fi
if [[ -n "${baseDataDir}" && ! -d "${baseDataDir}" ]]; then
echo "${baseDataDir} does not exist"
exit 1
@@ -165,17 +156,13 @@ if [[ "${sourceTarballUrl}" == "" ]]; then
fi
# Build data
# tlsConfig, dnsConfig, backupConfig are here for backward compat with < 1.9
# from 1.9, we use autoprovision.json
data=$(cat <<EOF
{
"provider": "${provider}",
"apiServerOrigin": "${apiServerOrigin}",
"webServerOrigin": "${webServerOrigin}",
"version": "${version}",
"tlsConfig": {
"provider": "${tlsProvider}"
}
"version": "${version}"
}
EOF
)
@@ -214,17 +201,6 @@ while true; do
sleep 10
done
autoprovision_data=$(cat <<EOF
{
"tlsConfig": {
"provider": "${tlsProvider}"
}
}
EOF
)
echo "${autoprovision_data}" > /home/yellowtent/configs/autoprovision.json
echo -e "\n\nVisit https://<IP> to finish setup once the server has rebooted.\n"
if [[ "${rebootServer}" == "true" ]]; then