remove config.edition

we will replace this with feature flags
This commit is contained in:
Girish Ramakrishnan
2019-05-06 19:53:30 -07:00
parent bbced03f3a
commit f96a8bc269
7 changed files with 7 additions and 43 deletions

View File

@@ -43,21 +43,19 @@ fi
initBaseImage="true"
# provisioning data
provider=""
edition=""
requestedVersion=""
apiServerOrigin="https://api.cloudron.io"
webServerOrigin="https://cloudron.io"
sourceTarballUrl=""
rebootServer="true"
args=$(getopt -o "" -l "help,skip-baseimage-init,provider:,version:,env:,edition:,skip-reboot" -n "$0" -- "$@")
args=$(getopt -o "" -l "help,skip-baseimage-init,provider:,version:,env:,skip-reboot" -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;;
--edition) edition="$2"; shift 2;;
--version) requestedVersion="$2"; shift 2;;
--env)
if [[ "$2" == "dev" ]]; then
@@ -126,11 +124,6 @@ elif [[ \
exit 1
fi
if [[ -n "${edition}" && ! -f "LICENSE" ]]; then
echo "A LICENSE is required to use this edition. Please contact support@cloudron.io"
exit 1
fi
echo ""
echo "##############################################"
echo " Cloudron Setup (${requestedVersion:-latest})"
@@ -208,8 +201,7 @@ cat > "/etc/cloudron/cloudron.conf" <<CONF_END
{
"apiServerOrigin": "${apiServerOrigin}",
"webServerOrigin": "${webServerOrigin}",
"provider": "${provider}",
"edition": "${edition}"
"provider": "${provider}"
}
CONF_END
@@ -218,8 +210,6 @@ if ! /bin/bash "${box_src_tmp_dir}/scripts/installer.sh" &>> "${LOG_FILE}"; then
exit 1
fi
[[ -f LICENSE ]] && cp LICENSE /etc/cloudron/LICENSE
echo -n "=> Waiting for cloudron to be ready (this takes some time) ..."
while true; do
echo -n "."