Only show plan selection UI for caas

baseimage/createEC2Image

@@ -159,6 +159,7 @@ while [ $i -lt ${#ec2_regions[*]} ]; do
     while true; do
         event_status=`aws ec2 describe-images --region ${ec2_regions[$i]} --profile ${aws_credentials} --image-id ${ec2_amis[$i]} | $JSON Images[0].State`
         if [[ "${event_status}" == "available" ]]; then
+            echo "done"
             break
         fi
         debug -n "."

setup/start.sh

@@ -34,6 +34,9 @@ set_progress() {
 set_progress "1" "Create container"
 $script_dir/container.sh
 
+set_progress "5" "Set hostname"
+hostnamectl set-hostname "${arg_fqdn}"
+
 set_progress "10" "Ensuring directories"
 # keep these in sync with paths.js
 [[ "${is_update}" == "false" ]] && btrfs subvolume create "${DATA_DIR}/box"

src/certificates.js

@@ -92,7 +92,7 @@ function getApi(app, callback) {
 }
 
 function installAdminCertificate(callback) {
-    if (cloudron.isConfiguredSync()) return callback();
+    if (!cloudron.isConfiguredSync()) return callback();
 
     settings.getTlsConfig(function (error, tlsConfig) {
         if (error) return callback(error);

webadmin/src/views/settings.html

@@ -118,13 +118,13 @@
     </div>
 </div>
 
-<div class="section-header" ng-show="user.admin">
+<div class="section-header" ng-show="config.provider === 'caas' && user.admin">
     <div class="text-left">
         <h3>Plans</h3>
     </div>
 </div>
 
-<div class="card" style="margin-bottom: 15px;" ng-show="user.admin">
+<div class="card" style="margin-bottom: 15px;" ng-show="config.provider === 'caas' && user.admin">
     <div class="row">
         <div class="col-xs-10 plans" style="margin-left: 20px">
             <div ng-repeat="plan in availablePlans">

webadmin/src/views/settings.js

@@ -311,10 +311,13 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
 
     Client.onReady(function () {
         fetchBackups();
-        getPlans();
 
-        $scope.currentPlan = $scope.config.plan;
+        if ($scope.config.provider === 'caas') {
-        $scope.currency = $scope.config.currency === 'eur' ? '€' : '$';
+            getPlans();
+
+            $scope.currentPlan = $scope.config.plan;
+            $scope.currency = $scope.config.currency === 'eur' ? '€' : '$';
+        }
     });
 
     // setup all the dialog focus handling