From b9d02989acfe1479248afcb46ef4825a9d31250b Mon Sep 17 00:00:00 2001 From: flxxyz Date: Mon, 24 Apr 2023 20:12:18 +0800 Subject: [PATCH] chore: minor configuration change --- .nostr.local/settings.json | 2 +- CONFIGURATION.md | 4 ++-- deployment/maintenance.yaml | 4 ++-- deployment/static-mirroring.yaml | 4 ++-- deployment/worker.yaml | 4 ++-- resources/default-settings.yaml | 18 +++++++++--------- src/factories/payments-processor-factory.ts | 4 ++-- test/integration/docker-compose.yml | 10 +++++----- tor/torrc | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.nostr.local/settings.json b/.nostr.local/settings.json index 0a982495..8afb6d37 100644 --- a/.nostr.local/settings.json +++ b/.nostr.local/settings.json @@ -38,7 +38,7 @@ "paymentProcessors": { "zebedee": { "baseURL": "https://api.zebedee.io/", - "callbackBaseURL": "https://nostream.localtest.me/callbacks/zebedee" + "callbackBaseURL": "https://denostr.localtest.me/callbacks/zebedee" } }, "workers": { diff --git a/CONFIGURATION.md b/CONFIGURATION.md index d570cf21..95913beb 100644 --- a/CONFIGURATION.md +++ b/CONFIGURATION.md @@ -30,7 +30,7 @@ The following environment variables can be set: # Settings -Running `nostream` for the first time creates the settings file in `/.nostr/settings.yaml`. If the file is not created and an error is thrown ensure that the `/.nostr` folder exists. The configuration directory +Running `denostr` for the first time creates the settings file in `/.nostr/settings.yaml`. If the file is not created and an error is thrown ensure that the `/.nostr` folder exists. The configuration directory can be changed by setting the `NOSTR_CONFIG_DIR` environment variable. | Name | Description | @@ -44,7 +44,7 @@ can be changed by setting the `NOSTR_CONFIG_DIR` environment variable. | network.remoteIpHeader | HTTP header from proxy containing IP address from client. | | mirroring.static[].address | Address of mirrored relay. (e.g. ws://100.100.100.100:8008) | | mirroring.static[].filters | Subscription filters used to mirror. | -| mirroring.static[].secret | Secret to pass to relays. Nostream relays only. Optional. | +| mirroring.static[].secret | Secret to pass to relays. Denostr relays only. Optional. | | workers.count | Number of workers to spin up to handle incoming connections. | | | Spin workers as many CPUs are available when set to zero. Defaults to zero. | | limits.event.eventId.minLeadingZeroBits | Leading zero bits required on every incoming event for proof of work. | diff --git a/deployment/maintenance.yaml b/deployment/maintenance.yaml index 9adcb8a9..e7f0ad1b 100644 --- a/deployment/maintenance.yaml +++ b/deployment/maintenance.yaml @@ -74,13 +74,13 @@ data: paymentsProcessors: zebedee: baseURL: https://api.zebedee.io/ - callbackBaseURL: https://nostream.your-domain.com/callbacks/zebedee + callbackBaseURL: https://denostr.your-domain.com/callbacks/zebedee ipWhitelist: - "3.225.112.64" - "::ffff:3.225.112.64" lnbits: baseURL: https://lnbits.your-domain.com/ - callbackBaseURL: https://nostream.your-domain.com/callbacks/lnbits + callbackBaseURL: https://denostr.your-domain.com/callbacks/lnbits network: maxPayloadSize: 524288 # Comment the next line if using CloudFlare proxy diff --git a/deployment/static-mirroring.yaml b/deployment/static-mirroring.yaml index 1ca2d9dd..7ca3424a 100644 --- a/deployment/static-mirroring.yaml +++ b/deployment/static-mirroring.yaml @@ -74,13 +74,13 @@ data: paymentsProcessors: zebedee: baseURL: https://api.zebedee.io/ - callbackBaseURL: https://nostream.your-domain.com/callbacks/zebedee + callbackBaseURL: https://denostr.your-domain.com/callbacks/zebedee ipWhitelist: - "3.225.112.64" - "::ffff:3.225.112.64" lnbits: baseURL: https://lnbits.your-domain.com/ - callbackBaseURL: https://nostream.your-domain.com/callbacks/lnbits + callbackBaseURL: https://denostr.your-domain.com/callbacks/lnbits network: maxPayloadSize: 524288 # Comment the next line if using CloudFlare proxy diff --git a/deployment/worker.yaml b/deployment/worker.yaml index 53452066..b9b9ff69 100644 --- a/deployment/worker.yaml +++ b/deployment/worker.yaml @@ -74,13 +74,13 @@ data: paymentsProcessors: zebedee: baseURL: https://api.zebedee.io/ - callbackBaseURL: https://nostream.your-domain.com/callbacks/zebedee + callbackBaseURL: https://denostr.your-domain.com/callbacks/zebedee ipWhitelist: - "3.225.112.64" - "::ffff:3.225.112.64" lnbits: baseURL: https://lnbits.your-domain.com/ - callbackBaseURL: https://nostream.your-domain.com/callbacks/lnbits + callbackBaseURL: https://denostr.your-domain.com/callbacks/lnbits network: maxPayloadSize: 524288 # Comment the next line if using CloudFlare proxy diff --git a/resources/default-settings.yaml b/resources/default-settings.yaml index 24dbd916..38fdbbcf 100755 --- a/resources/default-settings.yaml +++ b/resources/default-settings.yaml @@ -21,13 +21,13 @@ payments: paymentsProcessors: zebedee: baseURL: https://api.zebedee.io/ - callbackBaseURL: https://nostream.your-domain.com/callbacks/zebedee + callbackBaseURL: https://denostr.your-domain.com/callbacks/zebedee ipWhitelist: - "3.225.112.64" - "::ffff:3.225.112.64" lnbits: baseURL: https://lnbits.your-domain.com/ - callbackBaseURL: https://nostream.your-domain.com/callbacks/lnbits + callbackBaseURL: https://denostr.your-domain.com/callbacks/lnbits network: maxPayloadSize: 524288 # Comment the next line if using CloudFlare proxy @@ -105,14 +105,14 @@ limits: - 42 period: 60000 rate: 144 - - description: 480 events/min for encrypted channel event kinds 104 and 140-142 + - description: 1200 events/min for encrypted channel event kinds 104 and 140-142 kinds: - 104 - 140 - 141 - 142 period: 60000 - rate: 480 + rate: 1200 - description: 60 events/min for event kind ranges 5-7 and 43-49 kinds: - - 5 @@ -136,9 +136,9 @@ limits: - 29999 period: 60000 rate: 120 - - description: 2880 events/hour for all events + - description: 4800 events/hour for all events period: 3600000 - rate: 2880 + rate: 4800 whitelists: pubkeys: [] ipAddresses: @@ -147,13 +147,13 @@ limits: - "::ffff:10.10.10.1" client: subscription: - maxSubscriptions: 10 + maxSubscriptions: 20 maxFilters: 10 message: rateLimits: - - description: 480 raw messages/min + - description: 720 raw messages/min period: 60000 - rate: 480 + rate: 720 ipWhitelist: - "::1" - "10.10.10.1" diff --git a/src/factories/payments-processor-factory.ts b/src/factories/payments-processor-factory.ts index 3aa235a7..120d3ae8 100644 --- a/src/factories/payments-processor-factory.ts +++ b/src/factories/payments-processor-factory.ts @@ -57,7 +57,7 @@ const createZebedeePaymentsProcessor = ( ], settings) as string | undefined if ( typeof callbackBaseURL === 'undefined' || - callbackBaseURL.indexOf('nostream.your-domain.com') >= 0 + callbackBaseURL.indexOf('denostr.your-domain.com') >= 0 ) { const error = new Error( 'Setting paymentsProcessor.zebedee.callbackBaseURL is not configured.', @@ -98,7 +98,7 @@ const createLNbitsPaymentProcessor = ( ], settings) as string | undefined if ( typeof callbackBaseURL === 'undefined' || - callbackBaseURL.indexOf('nostream.your-domain.com') >= 0 + callbackBaseURL.indexOf('denostr.your-domain.com') >= 0 ) { const error = new Error( 'Setting paymentsProcessor.lnbits.callbackBaseURL is not configured.', diff --git a/test/integration/docker-compose.yml b/test/integration/docker-compose.yml index 1a268eb4..d3ad82cd 100644 --- a/test/integration/docker-compose.yml +++ b/test/integration/docker-compose.yml @@ -37,7 +37,7 @@ services: migrations-test: condition: service_completed_successfully networks: - - nostream-test + - denostr-test links: - db-test db-test: @@ -47,7 +47,7 @@ services: POSTGRES_PASSWORD: postgres POSTGRES_DB: nostr_ts_relay_test networks: - - nostream-test + - denostr-test ports: - 25432:5432 healthcheck: @@ -59,7 +59,7 @@ services: image: redis:7.0.5-alpine3.16 command: redis-server --loglevel warning --requirepass nostr_ts_relay_test networks: - - nostream-test + - denostr-test restart: always healthcheck: test: [ "CMD", "redis-cli", "ping", "|", "grep", "PONG" ] @@ -85,9 +85,9 @@ services: db-test: condition: service_healthy networks: - - nostream-test + - denostr-test links: - db-test networks: - nostream-test: + denostr-test: diff --git a/tor/torrc b/tor/torrc index a39d39a3..c46254ae 100644 --- a/tor/torrc +++ b/tor/torrc @@ -1,2 +1,2 @@ -HiddenServiceDir /var/lib/tor/nostream +HiddenServiceDir /var/lib/tor/denostr HiddenServicePort 80 10.10.10.2:8008