Bump version 0.2.3.

yukimochi · Jun 2, 2019 · 99c2525 · 99c2525
1 parent e3d5bec
commit 99c2525
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,7 +12,6 @@ jobs:
           name: build
           command: |
             go version
-            rm config.yaml
             go test -coverprofile=coverage.txt -covermode=atomic -p 1 . ./worker ./cli ./State
             bash <(curl -s https://codecov.io/bash)
   docker:

diff --git a/config.yaml → config.yaml.example b/config.yaml → config.yaml.example
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,12 +12,13 @@ services:
     command: worker
     environment:
       - "ACTOR_PEM=/actor.pem"
-      - "RELAY_SERVICENAME=YUKIMOCHI Toot Relay Service"
       - "RELAY_DOMAIN=relay.toot.yukimochi.jp"
+      - "RELAY_SERVICENAME=YUKIMOCHI Toot Relay Service"
+      - "RELAY_BIND=0.0.0.0:8080"
       - "REDIS_URL=redis://redis:6379"
     volumes:
       - "./actor.pem:/actor.pem"
-#       - "./config.yaml:/Activity-Relay/config.yaml"
+      # - "./config.yaml:/Activity-Relay/config.yaml"
 
   server:
     build: .
@@ -27,10 +28,10 @@ services:
     command: server
     environment:
       - "ACTOR_PEM=/actor.pem"
-      - "RELAY_SERVICENAME=YUKIMOCHI Toot Relay Service"
       - "RELAY_DOMAIN=relay.toot.yukimochi.jp"
+      - "RELAY_SERVICENAME=YUKIMOCHI Toot Relay Service"
       - "RELAY_BIND=0.0.0.0:8080"
       - "REDIS_URL=redis://redis:6379"
     volumes:
       - "./actor.pem:/actor.pem"
-#       - "./config.yaml:/Activity-Relay/config.yaml"
+      # - "./config.yaml:/Activity-Relay/config.yaml"
diff --git a/main.go b/main.go
@@ -65,7 +65,7 @@ func initConfig() {
 	if err != nil {
 		panic(err)
 	}
-	uaString = viper.GetString("relay_servicename") + " (golang net/http; Activity-Relay v0.2.2; " + hostURL.Host + ")"
+	uaString = viper.GetString("relay_servicename") + " (golang net/http; Activity-Relay v0.2.3; " + hostURL.Host + ")"
 	relayState = state.NewState(redisClient)
 	actorCache = cache.New(5*time.Minute, 10*time.Minute)
 	Actor.GenerateSelfKey(hostURL, &hostPrivatekey.PublicKey)

diff --git a/readme.md b/readme.md
@@ -22,14 +22,32 @@
 
 See [GitHub wiki](https://github.com/yukimochi/Activity-Relay/wiki)
 
-## Environment Variable
+## Configration
+
+### `config.yml`
+
+```yaml config.yml
+actor_pem: /actor.pem
+redis_url: redis://redis:6379
+
+relay_bind: 0.0.0.0:8080
+relay_domain: relay.toot.yukimochi.jp
+relay_servicename: YUKIMOCHI Toot Relay Service
+# relay_summary: |
+
+# relay_icon: https://
+# relay_image: https://
+```
+
+### `Environment Variable`
+
+ This is **Optional** : When `config.yml` not exists, use environment variable.
 
  - `ACTOR_PEM` (ex. `/actor.pem`)
+ - `REDIS_URL` (ex. `redis://127.0.0.1:6379/0`)
+ - `RELAY_BIND` (ex. `0.0.0.0:8080`)
  - `RELAY_DOMAIN` (ex. `relay.toot.yukimochi.jp`)
  - `RELAY_SERVICENAME` (ex. `YUKIMOCHI Toot Relay Service`)
- - `RELAY_BIND` (ex. `0.0.0.0:8080`)
- - `REDIS_URL` (ex. `redis://127.0.0.1:6379/0`)
-
 
 ## License
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fyukimochi%2FActivity-Relay.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fyukimochi%2FActivity-Relay?ref=badge_large)
diff --git a/worker/worker.go b/worker/worker.go
@@ -84,7 +84,7 @@ func initConfig() {
 	}
 	newNullLogger := NewNullLogger()
 	log.DEBUG = newNullLogger
-	uaString = viper.GetString("relay_servicename") + " (golang net/http; Activity-Relay v0.2.2; " + hostURL.Host + ")"
+	uaString = viper.GetString("relay_servicename") + " (golang net/http; Activity-Relay v0.2.3; " + hostURL.Host + ")"
 	Actor.GenerateSelfKey(hostURL, &hostPrivatekey.PublicKey)
 
 	fmt.Println("Welcome to YUKIMOCHI Activity-Relay [Worker]\n - Configrations")