From bfe62f1cc43bbadb30eeb9be269c4048e417bb69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorben=20G=C3=BCnther?= <admin@xenrox.net>
Date: Wed, 11 Dec 2019 17:09:49 +0100
Subject: [PATCH] Read redis host from cfg.

---
 config.example.ini                 | 3 +++
 gitsrht-keys/main.go               | 9 +++++++--
 gitsrht-update-hook/post-update.go | 7 ++++++-
 gitsrht-update-hook/update.go      | 7 ++++++-
 gitsrht/blueprints/api.py          | 2 +-
 gitsrht/blueprints/repo.py         | 2 +-
 gitsrht/git.py                     | 2 +-
 7 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/config.example.ini b/config.example.ini
index d608188..2f04504 100644
--- a/config.example.ini
+++ b/config.example.ini
@@ -21,6 +21,9 @@ source-url=https://git.sr.ht/~sircmpwn/srht
 #
 # A secret key to encrypt session cookies with
 secret-key=CHANGEME
+#
+# The redis host url.
+redis-host=
 
 [mail]
 #
diff --git a/gitsrht-keys/main.go b/gitsrht-keys/main.go
index 7741db1..410cec2 100644
--- a/gitsrht-keys/main.go
+++ b/gitsrht-keys/main.go
@@ -122,7 +122,7 @@ func fetchKeysFromMeta(logger *log.Logger, config ini.File,
 	// Cache in Redis too
 	cacheKey := fmt.Sprintf("git.sr.ht.ssh-keys.%s", b64key)
 	cache := KeyCache{
-		UserId: userId,
+		UserId:   userId,
 		Username: key.Owner.Username,
 	}
 	cacheBytes, err := json.Marshal(&cache)
@@ -148,7 +148,12 @@ func main() {
 	)
 	// TODO: update key last used timestamp on meta.sr.ht
 
-	redis := goredis.NewClient(&goredis.Options{Addr: "localhost:6379"})
+	redisHost, ok := config.Get("sr.ht", "redis-host")
+	if !ok {
+		redisHost = "localhost"
+	}
+	redisHost += ":6379"
+	redis := goredis.NewClient(&goredis.Options{Addr: redisHost})
 
 	logf, err := os.OpenFile("/var/log/gitsrht-keys",
 		os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
diff --git a/gitsrht-update-hook/post-update.go b/gitsrht-update-hook/post-update.go
index 2265762..ae588f7 100644
--- a/gitsrht-update-hook/post-update.go
+++ b/gitsrht-update-hook/post-update.go
@@ -160,7 +160,12 @@ func postUpdate() {
 		logger.Fatalf("Failed to fetch info from database: %v", err)
 	}
 
-	redis := goredis.NewClient(&goredis.Options{Addr: "localhost:6379"})
+	redisHost, ok := config.Get("sr.ht", "redis-host")
+	if !ok {
+		redisHost = "localhost"
+	}
+	redisHost += ":6379"
+	redis := goredis.NewClient(&goredis.Options{Addr: redisHost})
 	for i, refname := range refs {
 		var oldref, newref string
 		var oldobj, newobj object.Object
diff --git a/gitsrht-update-hook/update.go b/gitsrht-update-hook/update.go
index 7972a59..93ef540 100644
--- a/gitsrht-update-hook/update.go
+++ b/gitsrht-update-hook/update.go
@@ -22,7 +22,12 @@ func update() {
 	}
 	logger.Printf("Running update for push %s", pushUuid)
 
-	redis := goredis.NewClient(&goredis.Options{Addr: "localhost:6379"})
+	redisHost, ok := config.Get("sr.ht", "redis-host")
+	if !ok {
+		redisHost = "localhost"
+	}
+	redisHost += ":6379"
+	redis := goredis.NewClient(&goredis.Options{Addr: redisHost})
 	redis.Set(fmt.Sprintf("update.%s.%s", pushUuid, refname),
 		fmt.Sprintf("%s:%s", oldref, newref), 10*time.Minute)
 }
diff --git a/gitsrht/blueprints/api.py b/gitsrht/blueprints/api.py
index f4c126a..ec88288 100644
--- a/gitsrht/blueprints/api.py
+++ b/gitsrht/blueprints/api.py
@@ -10,9 +10,9 @@ from gitsrht.webhooks import RepoWebhook
 from io import BytesIO
 from scmsrht.access import UserAccess
 from scmsrht.blueprints.api import get_user, get_repo
-from scmsrht.redis import redis
 from srht.api import paginated_response
 from srht.oauth import current_token, oauth
+from srht.redis import redis
 from srht.validation import Validation
 
 data = Blueprint("api.data", __name__)
diff --git a/gitsrht/blueprints/repo.py b/gitsrht/blueprints/repo.py
index 9d739f1..4ad7bf3 100644
--- a/gitsrht/blueprints/repo.py
+++ b/gitsrht/blueprints/repo.py
@@ -20,10 +20,10 @@ from pygments.formatters import HtmlFormatter
 from pygments.lexers import guess_lexer, guess_lexer_for_filename, TextLexer
 from scmsrht.access import get_repo, get_repo_or_redir
 from scmsrht.formatting import get_formatted_readme, get_highlighted_file
-from scmsrht.redis import redis
 from scmsrht.urls import get_clone_urls
 from srht.config import cfg
 from srht.markdown import markdown
+from srht.redis import redis
 
 repo = Blueprint('repo', __name__)
 
diff --git a/gitsrht/git.py b/gitsrht/git.py
index 852d35f..b99f1c6 100644
--- a/gitsrht/git.py
+++ b/gitsrht/git.py
@@ -2,7 +2,7 @@ from collections import deque
 from datetime import datetime, timedelta, timezone
 from pygit2 import Repository as GitRepository, Tag
 from jinja2 import Markup, escape
-from scmsrht.redis import redis
+from srht.redis import redis
 from stat import filemode
 import pygit2
 import json
-- 
2.38.4