koding · koding-bot · Aug 14, 2017 · Aug 10, 2017 · Aug 10, 2017 · Aug 11, 2017
diff --git a/client/app/lib/providers/managed/addmanagedmachinemodal.coffee b/client/app/lib/providers/managed/addmanagedmachinemodal.coffee
@@ -87,7 +87,7 @@ module.exports = class AddManagedMachineModal extends ContentModal
       then "export KONTROLURL=#{KodingKontrol.getKontrolUrl()} CHANNEL=devmanaged; "
       else ''
 
-    cmd = "#{kontrolUrl}curl -sL https://kodi.ng/s | bash -s #{token}"
+    cmd = "#{kontrolUrl}curl -sL https://kodi.ng/c/p/kd | bash -s #{token}"
 
     @loader.destroy()
 

diff --git a/go/src/koding/kites/config/cache.go b/go/src/koding/kites/config/cache.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"errors"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -88,8 +89,22 @@ func newBoltDB(o *CacheOptions) (*bolt.DB, error) {
 
 	_ = util.Chown(o.File, o.owner().User)
 
+	// Opening may fail with "bad file descriptor" coming from mmap,
+	// when file exists and is 0 in size. Best-effort retry - remove
+	// the file and open it again.
+	//
+	// Reproduced on Fedora 25.
+	if e, ok := err.(*os.PathError); ok && e.Op == "write" {
+		if fi, e := os.Stat(o.File); e == nil {
+			if fi.Size() == 0 {
+				_ = os.Remove(o.File)
+				db, err = bolt.Open(o.File, 0644, o.BoltDB)
+			}
+		}
+	}
+
 	if err != nil {
-		return nil, err
+		return nil, errors.New("error opening config: " + err.Error())
 	}
 
 	return db, nil

diff --git a/go/src/koding/kites/config/konfig.go b/go/src/koding/kites/config/konfig.go
@@ -169,9 +169,9 @@ type Konfig struct {
 	PublicBucketName   string `json:"publicBucketName,omitempty"`
 	PublicBucketRegion string `json:"publicBucketRegion,omitempty"`
 
-	LockTimeout    time.Duration `json:"lockTimeout,omitempty"`
-	DisableMetrics bool          `json:"disableMetrics,string,omitempty"`
-	Debug          bool          `json:"debug,string,omitempty"`
+	LockTimeout    int  `json:"lockTimeout,omitempty,string"`
+	DisableMetrics bool `json:"disableMetrics,string,omitempty"`
+	Debug          bool `json:"debug,string,omitempty"`
 }
 
 // KiteHome gives directory of the kite.key file.
@@ -385,7 +385,7 @@ func NewKonfig(e *Environments) *Konfig {
 		},
 		PublicBucketName:   Builtin.Buckets.PublicLogs.Name,
 		PublicBucketRegion: Builtin.Buckets.PublicLogs.Region,
-		LockTimeout:        3 * time.Second,
+		LockTimeout:        3,
 	}
 }
 

diff --git a/go/src/koding/klient/DEPLOYMENT.md b/go/src/koding/klient/DEPLOYMENT.md
@@ -81,8 +81,6 @@ copy: s3://koding-klient/development/215/klient_0.1.215_development_amd64.deb to
 copy: s3://koding-klient/development/latest/klient-0.1.215.gz to s3://koding-klient/development/latest/klient.gz
 copy: s3://koding-klient/development/latest/klient-0.1.215.darwin_amd64.gz to s3://koding-klient/development/latest/klient.darwin_amd64.gz
 copy: s3://koding-klient/development/latest/klient_0.1.215_development_amd64.deb to s3://koding-klient/development/latest/klient.deb
-delete: s3://koding-klient/install.sh
-upload: ./install.sh to s3://koding-klient/install.sh
 # updating latest-version.txt to 215
 delete: s3://koding-klient/development/latest-version.txt
 upload: ./latest-version.txt to s3://koding-klient/development/latest-version.txt

diff --git a/go/src/koding/klient/deploy.sh b/go/src/koding/klient/deploy.sh
@@ -54,9 +54,6 @@ s3cp "s3://${BUCKET}/${CHANNEL}/latest/klient-0.1.${VERSION}.gz" "s3://${BUCKET}
 s3cp "s3://${BUCKET}/${CHANNEL}/latest/klient-0.1.${VERSION}.darwin_amd64.gz" "s3://${BUCKET}/${CHANNEL}/latest/klient.darwin_amd64.gz"
 s3cp "s3://${BUCKET}/${CHANNEL}/latest/klient_0.1.${VERSION}_${CHANNEL}_amd64.deb" "s3://${BUCKET}/${CHANNEL}/latest/klient.deb"
 
-s3rm "s3://${BUCKET}/install.sh"
-s3cp "${REPO_PATH}/go/src/koding/klient/install.sh" "s3://${BUCKET}/install.sh"
-
 echo "# updating latest-version.txt to $VERSION"
 
 echo $VERSION > latest-version.txt