Merge remote-tracking branch 'upstream/0.4.0' into 0.4.0

.drone.yml

@@ -4,8 +4,10 @@ git:
 env:
   - GOROOT=/usr/local/go
   - PATH=$PATH:$GOROOT/bin:$GOPATH/bin
+
 script:
-  - git clone git://github.com/gin-gonic/gin.git $GOPATH/src/github.com/gin-gonic/gin
+  - go get golang.org/x/tools/cmd/cover
+  - go get golang.org/x/tools/cmd/vet
   - go get -u github.com/jteeuwen/go-bindata/...
   - make bindata deps
   - make build
@@ -42,4 +44,4 @@ build:
     - go get -u github.com/jteeuwen/go-bindata/...
     - make bindata deps
     - make build
-    - make test
+    - make test

.gitignore

@@ -18,9 +18,10 @@ drone
 *.rice-box.go
 *.db
 *.txt
-*.toml
 *.min.js
 *_bindata.go
+*.toml
+!dist/drone/etc/drone/drone.toml
 
 # generate binaries
 cmd/drone-agent/drone-agent

README.md

@@ -34,7 +34,7 @@ key = ""
 addr = "unix:///var/run/docker.sock"
 swarm = ""
 
-[service]
+[remote]
 kind = "github"
 base = "https://github.com"
 orgs = []
@@ -53,19 +53,24 @@ request_token = ""
 secret = ""
 ```
 
-Configuration settings can also be set by environment variables using the scheme `DRONE_<section>_<confkey>`, substituting the section title for `<section>` and the key for `<confkey>`, in all caps. For example:
+Configuration settings can also be set by environment variables using the scheme
+`DRONE_<section>_<confkey>`, substituting the section title for `<section>` and
+the key for `<confkey>`, in all caps. For example:
 
 ```shell
 #!/bin/bash
 # prepare environment for executing drone
+DRONE_REMOTE_BASE="https://github.com"      # for [remote] section, 'base' setting
 DRONE_DOCKER_ADDR="tcp://10.0.0.1:2375"     # for [docker] section, 'addr' setting
 DRONE_AUTH_CLIENT="0123456789abcdef0123AA"  # for [auth] section, 'client' setting
 DRONE_AUTH_SECRET="<sha-1 hash secret>"     # for [auth] section, 'secret' setting
+DRONE_AUTH_ACCESSTOKEN="<url>"              # for [auth] section, 'access_token' setting
 
 exec ./drone -config=drone.toml
 ```
 
-_NOTE: Configuration settings from environment variables override values set in the TOML file._
+_NOTE: Configuration settings from environment variables override values set in
+the TOML file._
 
 
 ### From Source
@@ -85,8 +90,9 @@ bin/drone
 bin/drone --debug # debug mode loads static content from filesystem
 ```
 
-**NOTE** if you are seeing slow compile times you can try running `go install` for the vendored `go-sqlite3` library:
+**NOTE** if you are seeing slow compile times you can try running `go install`
+for the vendored `go-sqlite3` library:
 
 ```sh
 go install github.com/drone/drone/Godeps/_workspace/src/github.com/mattn/go-sqlite3
-```
+```

dist/drone/DEBIAN/conffiles

@@ -1,2 +1,2 @@
 /etc/init/drone.conf
-/etc/drone/drone.toml
+/etc/drone/drone.toml

dist/drone/etc/drone/drone.toml

@@ -0,0 +1,36 @@
+[server]
+addr = ":80"
+cert = ""
+key = ""
+
+# [session]
+# secret = ""
+# expires = ""
+
+[database]
+path = "/var/lib/drone/drone.sqlite"
+
+[docker]
+cert = ""
+key = ""
+addr = "unix:///var/run/docker.sock"
+swarm = ""
+
+# [service]
+# kind = "github"
+# base = "https://github.com"
+# orgs = []
+# open = false
+# private = false
+# skip_verify = true
+
+# [auth]
+# client = ""
+# secret = ""
+# authorize = "https://github.com/login/oauth/authorize"
+# access_token = "https://github.com/login/oauth/access_token"
+# request_token = ""
+
+# [agents]
+# secret = ""
+