Skip to content

Commit

Permalink
chore: minor configuration change
Browse files Browse the repository at this point in the history
  • Loading branch information
flxxyz committed Apr 24, 2023
1 parent c52b330 commit b9d0298
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .nostr.local/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions CONFIGURATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The following environment variables can be set:

# Settings

Running `nostream` for the first time creates the settings file in `<project_root>/.nostr/settings.yaml`. If the file is not created and an error is thrown ensure that the `<project_root>/.nostr` folder exists. The configuration directory
Running `denostr` for the first time creates the settings file in `<project_root>/.nostr/settings.yaml`. If the file is not created and an error is thrown ensure that the `<project_root>/.nostr` folder exists. The configuration directory
can be changed by setting the `NOSTR_CONFIG_DIR` environment variable.

| Name | Description |
Expand All @@ -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. |
Expand Down
4 changes: 2 additions & 2 deletions deployment/maintenance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deployment/static-mirroring.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deployment/worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions resources/default-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/factories/payments-processor-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down Expand Up @@ -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.',
Expand Down
10 changes: 5 additions & 5 deletions test/integration/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ services:
migrations-test:
condition: service_completed_successfully
networks:
- nostream-test
- denostr-test
links:
- db-test
db-test:
Expand All @@ -47,7 +47,7 @@ services:
POSTGRES_PASSWORD: postgres
POSTGRES_DB: nostr_ts_relay_test
networks:
- nostream-test
- denostr-test
ports:
- 25432:5432
healthcheck:
Expand All @@ -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" ]
Expand All @@ -85,9 +85,9 @@ services:
db-test:
condition: service_healthy
networks:
- nostream-test
- denostr-test
links:
- db-test

networks:
nostream-test:
denostr-test:
2 changes: 1 addition & 1 deletion tor/torrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
HiddenServiceDir /var/lib/tor/nostream
HiddenServiceDir /var/lib/tor/denostr
HiddenServicePort 80 10.10.10.2:8008

0 comments on commit b9d0298

Please sign in to comment.