cwtch.im
/
server
7
3
Fork 4
Code Issues 7 Pull Requests Releases 17 Wiki Activity

fix tofubundle dump from app, fix READAME docker lines to be correct; drone more specific to avoid container checks on latest
continuous-integration/drone/pr Build is passing Details

This commit is contained in:
Dan Ballard 2021-12-22 08:42:24 -05:00
parent b9ca357dfd
commit 20de58bb56
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.drone.yml
View File

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

6
README.md
View File

@ -30,7 +30,7 @@ The app takes the following environment variables
## Using the Server ## 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 ## 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 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: 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`

2
app/main.go
View File

@ -96,7 +96,7 @@ func main() {
if *flagExportServer { if *flagExportServer {
// Todo: change all to server export // 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 // Graceful Stop