aljaz/haven
1
0
Fork 0
mirror of https://github.com/aljazceru/haven.git synced 2025-12-20 07:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

add blossom on dedicated port

Browse Source
This commit is contained in:
Barry Deen
2024-10-29 17:29:06 -04:00
parent 67af27edf9
commit 0bf58d2d85
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.go
View File

@@ -45,6 +45,7 @@ type Config struct {
BackupIntervalHours int `json:"backup_interval_hours"` BackupIntervalHours int `json:"backup_interval_hours"`
BlastrRelays []string `json:"blastr_relays"` BlastrRelays []string `json:"blastr_relays"`
BlossomPath string `json:"blossom_path"` BlossomPath string `json:"blossom_path"`
BlossomPort int `json:"blossom_port"`
} }
type AwsConfig struct { type AwsConfig struct {
@@ -61,6 +62,7 @@ func loadConfig() Config {
OwnerNpub: getEnv("OWNER_NPUB"), OwnerNpub: getEnv("OWNER_NPUB"),
DBEngine: getEnvString("DB_ENGINE", "lmdb"), DBEngine: getEnvString("DB_ENGINE", "lmdb"),
BlossomPath: getEnvString("BLOSSOM_PATH", "blossom"), BlossomPath: getEnvString("BLOSSOM_PATH", "blossom"),
BlossomPort: getEnvInt("BLOSSOM_PORT", 3366),
RelayURL: getEnv("RELAY_URL"), RelayURL: getEnv("RELAY_URL"),
RelayPort: getEnvInt("RELAY_PORT", 3355), RelayPort: getEnvInt("RELAY_PORT", 3355),
RelayBindAddress: getEnvString("RELAY_BIND_ADDRESS", "0.0.0.0"), RelayBindAddress: getEnvString("RELAY_BIND_ADDRESS", "0.0.0.0"),

4
init.go
View File

@@ -229,9 +229,9 @@ func initRelays() {
outboxRelayLimits.ConnectionRateLimiterMaxTokens, outboxRelayLimits.ConnectionRateLimiterMaxTokens,
), ),
) )
addr := fmt.Sprintf("%s:%d", config.RelayBindAddress, config.RelayPort) addr := fmt.Sprintf("%s:%d", config.RelayBindAddress, config.BlossomPort)
bl := blossom.New(outboxRelay, addr+"/blossom") bl := blossom.New(outboxRelay, addr)
bl.Store = blossom.EventStoreBlobIndexWrapper{Store: outboxDB, ServiceURL: bl.ServiceURL} bl.Store = blossom.EventStoreBlobIndexWrapper{Store: outboxDB, ServiceURL: bl.ServiceURL}
bl.StoreBlob = append(bl.StoreBlob, func(ctx context.Context, sha256 string, body []byte) error { bl.StoreBlob = append(bl.StoreBlob, func(ctx context.Context, sha256 string, body []byte) error {
if khatru.GetAuthed(ctx) != nPubToPubkey(config.OwnerNpub) { if khatru.GetAuthed(ctx) != nPubToPubkey(config.OwnerNpub) {