From 3ee14879857a017d72762a661009319ef957bd87 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Tue, 29 Dec 2015 17:57:11 +0100
Subject: [PATCH] We might support more than just caas and selfhosted

---
 images/initializeBaseUbuntuImage.sh |  6 +++---
 src/server.js                       | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/images/initializeBaseUbuntuImage.sh b/images/initializeBaseUbuntuImage.sh
index 5fd11543e..a484a8cc1 100755
--- a/images/initializeBaseUbuntuImage.sh
+++ b/images/initializeBaseUbuntuImage.sh
@@ -211,9 +211,9 @@ cd "${INSTALLER_SOURCE_DIR}" && npm install --production
 chown "${USER}:${USER}" -R "${INSTALLER_SOURCE_DIR}"
 
 echo "==== Install installer systemd script ===="
-selfhostEnv=""
+provisionEnv="digitalocean"
 if [ ${SELFHOSTED} == 1 ]; then
-    selfhostEnv="SELFHOSTED=true"
+    provisionEnv="PROVISION=local"
 fi
 
 cat > /etc/systemd/system/cloudron-installer.service <<EOF
@@ -223,7 +223,7 @@ Description=Cloudron Installer
 [Service]
 Type=idle
 ExecStart="${INSTALLER_SOURCE_DIR}/src/server.js"
-Environment="DEBUG=installer*,connect-lastmile" ${selfhostEnv}
+Environment="DEBUG=installer*,connect-lastmile" ${provisionEnv}
 KillMode=process
 Restart=on-failure
 
diff --git a/src/server.js b/src/server.js
index af0b409f0..6822066d3 100755
--- a/src/server.js
+++ b/src/server.js
@@ -31,7 +31,7 @@ var CLOUDRON_CONFIG_FILE = '/home/yellowtent/configs/cloudron.conf';
 var gHttpsServer = null, // provision server; used for install/restore
     gHttpServer = null; // update server; used for updates
 
-function provisionCaaS(callback) {
+function provisionDigitalOcean(callback) {
     if (fs.existsSync(CLOUDRON_CONFIG_FILE)) return callback(null); // already provisioned
 
     superagent.get('http://169.254.169.254/metadata/v1.json').end(function (error, result) {
@@ -46,7 +46,7 @@ function provisionCaaS(callback) {
     });
 }
 
-function provisionSelfhost(callback) {
+function provisionLocal(callback) {
     if (fs.existsSync(CLOUDRON_CONFIG_FILE)) return callback(null); // already provisioned
 
     if (!fs.existsSync(PROVISION_CONFIG_FILE)) {
@@ -177,20 +177,20 @@ function start(callback) {
 
     var actions;
 
-    if (process.env.SELFHOSTED) {
+    if (process.env.PROVISION === 'local') {
         debug('Starting Installer in selfhost mode');
 
         actions = [
             startUpdateServer,
-            provisionSelfhost
+            provisionLocal
         ];
-    } else {
+    } else {    // current fallback, should be 'digitalocean' eventually
         debug('Starting Installer in managed mode');
 
         actions = [
             startUpdateServer,
             startProvisionServer,
-            provisionCaaS
+            provisionDigitalOcean
         ];
     }