Merge pull request 'minor fixes' (#29) from minorFixes into trunk

Reviewed-on: #29

.drone.yml

@@ -5,7 +5,7 @@ name: linux-test
 
 steps:
   - name: fetch
-    image: golang
+    image: golang:1.17.5
     volumes:
       - name: deps
         path: /go
@@ -18,7 +18,7 @@ steps:
       - echo `date +%G-%m-%d-%H-%M` > BUILDDATE
 
   - name: quality
-    image: golang
+    image: golang:1.17.5
     volumes:
       - name: deps
         path: /go
@@ -27,7 +27,7 @@ steps:
       - staticcheck ./...
 
   - name: units-tests
-    image: golang
+    image: golang:1.17.5
     volumes:
       - name: deps
         path: /go
@@ -35,7 +35,7 @@ steps:
       - sh testing/tests.sh
 
   - name: test-builda-app
-    image: golang
+    image: golang:1.17.5
     volumes:
       - name: deps
         path: /go
@@ -45,6 +45,7 @@ steps:
 
   - name: notify-email
     image: drillster/drone-email
+    pull: if-not-exists
     settings:
       host: build.openprivacy.ca
       port: 25
@@ -54,6 +55,7 @@ steps:
       status: [failure]
 
   - name: notify-gogs
+    pull: if-not-exists
     image: openpriv/drone-gogs
     when:
       event: pull_request

README.md

@@ -30,7 +30,7 @@ The app takes the following environment variables
 
 ## Using the Server
 
-When run the app will output standard log lines, one of which will contain the `tofubundle` in purple. This is the part you need to capture and import into a Cwtch client app so you can use the server for hosting groups
+When run the app will output standard log lines, one of which will contain the `serverbundle` in purple. This is the part you need to capture and import into a Cwtch client app so you can use the server for hosting groups
 
 ## Docker
 
@@ -42,8 +42,8 @@ or run our prebuild ones with
 
 and run it. It stores all Cwtch data in a Volume at `/var/lib/cwtch` so if you want the server data to persist you would run
 
-`docker run openpriv/cwtch-server -v /var/lib/cwtch/server01:/var/lib/cwtch`
+`docker run -v /var/lib/cwtch/server01:/var/lib/cwtch openpriv/cwtch-server`
 
 to create a persistent container you might try a command like:
 
-`docker run openpriv/cwtch-server --name cwtch -v /var/lib/cwtch/server01:/var/lib/cwtch --restart always`
+`docker run --name cwtch -v /var/lib/cwtch/server01:/var/lib/cwtch --restart always openpriv/cwtch-server`

app/main.go

@@ -96,7 +96,7 @@ func main() {
 
 	if *flagExportServer {
 		// Todo: change all to server export
-		ioutil.WriteFile(path.Join(serverConfig.ConfigDir, "serverbundle"), []byte(server.TofuBundle()), 0600)
+		ioutil.WriteFile(path.Join(serverConfig.ConfigDir, "serverbundle"), []byte(server.ServerBundle()), 0600)
 	}
 
 	// Graceful Stop