lilfade/Activity-Relay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

file config, avator, header image. (#18)

Browse Source
This commit is contained in:
Naoki Kosaka
2019-04-10 17:23:25 +09:00
committed by GitHub
parent d3d03544fa
commit 97f4655e9c
8 changed files with 85 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
worker/worker.go
View File

@ -48,10 +48,23 @@ func registorActivity(args ...string) error {
}
func initConfig() {
viper.BindEnv("actor_pem")
viper.BindEnv("relay_domain")
viper.BindEnv("relay_servicename")
viper.BindEnv("redis_url")
viper.SetConfigName("config")
viper.AddConfigPath(".")
err := viper.ReadInConfig()
if err != nil {
fmt.Println("Config file is not exists. Use environment variables.")
viper.BindEnv("actor_pem")
viper.BindEnv("relay_domain")
viper.BindEnv("relay_bind")
viper.BindEnv("relay_servicename")
viper.BindEnv("redis_url")
} else {
Actor.Summary = viper.GetString("relay_summary")
Actor.Icon = activitypub.Image{viper.GetString("relay_icon")}
Actor.Image = activitypub.Image{viper.GetString("relay_image")}
}
Actor.Name = viper.GetString("relay_servicename")
hostURL, _ = url.Parse("https://" + viper.GetString("relay_domain"))
hostPrivatekey, _ = keyloader.ReadPrivateKeyRSAfromPath(viper.GetString("actor_pem"))
redisOption, err := redis.ParseURL(viper.GetString("redis_url"))
@ -72,7 +85,7 @@ func initConfig() {
newNullLogger := NewNullLogger()
log.DEBUG = newNullLogger
uaString = viper.GetString("relay_servicename") + " (golang net/http; Activity-Relay v0.2.2; " + hostURL.Host + ")"
Actor.GenerateSelfKey(hostURL, viper.GetString("relay_servicename"), &hostPrivatekey.PublicKey)
Actor.GenerateSelfKey(hostURL, &hostPrivatekey.PublicKey)
fmt.Println("Welcome to YUKIMOCHI Activity-Relay [Worker]\n - Configrations")
fmt.Println("RELAY DOMAIN : ", hostURL.Host)