Compare commits

..

No commits in common. "master" and "v0.1.0" have entirely different histories.

5 changed files with 62 additions and 77 deletions

View File

@ -1,19 +1,10 @@
node.default["strfry"]["repo"] = "https://github.com/hoytech/strfry.git"
node.default["strfry"]["revision"] = "1.0.1"
node.default["strfry"]["revision"] = "master"
node.default["strfry"]["download_url"] = nil
node.default["strfry"]["checksum"] = nil
node.default["strfry"]["user"] = "strfry"
node.default["strfry"]["group"] = "strfry"
node.default["strfry"]["config"] = {
db: "/var/lib/strfry"
# db_params: {},
# events: {},
# relay: {
# info: {},
# writePolicy: {},
# compression: {},
# logging: {},
# num_threads: {},
# negentropy: {}
# }
}
node.default["strfry"]["db_path"] = "/var/lib/strfry"
node.default["strfry"]["bind_ip"] = "0.0.0.0"
node.default["strfry"]["real_ip_header"] = ""
node.default["strfry"]["info"] = {}

View File

@ -35,11 +35,3 @@ suites:
verifier:
inspec_tests:
- test/integration/default
attributes:
strfry:
config:
relay:
bind: 0.0.0.0
port: 7778
info:
name: "Test relay"

View File

@ -40,7 +40,7 @@ else
execute "compile" do
cwd "/usr/local/src/strfry"
command "make setup-golpe && make -j$(nproc)"
action :nothing
# action :nothing
notifies :create, "link[/usr/local/bin/strfry]", :immediately
notifies :restart, "service[strfry]", :delayed
end
@ -55,11 +55,11 @@ group node["strfry"]["group"]
user node["strfry"]["user"] do
gid node["strfry"]["group"]
manage_home true
shell "/bin/bash"
manage_home false
shell "/usr/sbin/nologin"
end
directory node["strfry"]["config"]["db"] do
directory node["strfry"]["db_path"] do
owner node["strfry"]["user"]
group node["strfry"]["group"]
mode "0755"
@ -70,7 +70,14 @@ template "/etc/strfry.conf" do
mode "0644"
owner node["strfry"]["user"]
group node["strfry"]["group"]
variables config: node["strfry"]["config"]
variables config: {
db_path: node["strfry"]["db_path"],
bind: node["strfry"]["bind_ip"],
real_ip_header: node["strfry"]["real_ip_header"],
port: node["strfry"]["port"],
nofiles: node["strfry"]["nofiles"],
info: node["strfry"]["info"]
}
notifies :restart, "service[strfry]", :delayed
end
@ -90,7 +97,7 @@ systemd_unit "strfry.service" do
ExecStart: "/usr/local/bin/strfry relay",
Restart: "on-failure",
RestartSec: "5",
ProtectHome: "no",
ProtectHome: "yes",
NoNewPrivileges: "yes",
ProtectSystem: "full",
LimitCORE: "1000000000"

View File

@ -1,138 +1,134 @@
# Directory that contains the strfry LMDB database (restart required)
db = "<%= @config.dig(:db) || "" %>/"
db = "<%= @config[:db_path] %>/"
dbParams {
# Maximum number of threads/processes that can simultaneously have LMDB transactions open (restart required)
maxreaders = <%= @config.dig(:db_params, :maxreaders) || "256" %>
maxreaders = 256
# Size of mmap() to use when loading LMDB (default is 10TB, does *not* correspond to disk-space used) (restart required)
mapsize = <%= @config.dig(:db_params, :mapsize) || "10995116277760" %>
mapsize = 10995116277760
# Disables read-ahead when accessing the LMDB mapping. Reduces IO activity when DB size is larger than RAM. (restart required)
noReadAhead = <%= @config.dig(:db_params, :no_read_ahead) || "false" %>
noReadAhead = false
}
events {
# Maximum size of normalised JSON, in bytes
maxEventSize = <%= @config.dig(:events, :max_event_size) || "65536" %>
maxEventSize = 65536
# Events newer than this will be rejected
rejectEventsNewerThanSeconds = <%= @config.dig(:events, :reject_events_newer_than_seconds) || "900" %>
rejectEventsNewerThanSeconds = 900
# Events older than this will be rejected
rejectEventsOlderThanSeconds = <%= @config.dig(:events, :reject_events_older_than_seconds) || "94608000" %>
rejectEventsOlderThanSeconds = 94608000
# Ephemeral events older than this will be rejected
rejectEphemeralEventsOlderThanSeconds = <%= @config.dig(:events, :reject_ephemeral_events_older_than_seconds) || "60" %>
rejectEphemeralEventsOlderThanSeconds = 60
# Ephemeral events will be deleted from the DB when older than this
ephemeralEventsLifetimeSeconds = <%= @config.dig(:events, :ephemeral_events_lifetime_seconds) || "300" %>
ephemeralEventsLifetimeSeconds = 300
# Maximum number of tags allowed
maxNumTags = <%= @config.dig(:events, :max_num_tags) || "2000" %>
maxNumTags = 2000
# Maximum size for tag values, in bytes
maxTagValSize = <%= @config.dig(:events, :max_tag_val_size) || "1024" %>
maxTagValSize = 1024
}
relay {
# Interface to listen on. Use 0.0.0.0 to listen on all interfaces (restart required)
bind = "<%= @config.dig(:relay, :bind) || "127.0.0.1" %>"
bind = "<%= @config[:bind] || "127.0.0.1" %>"
# Port to open for the nostr websocket protocol (restart required)
port = <%= @config.dig(:relay, :port) || "7777" %>
port = <%= @config[:port] || "7777" %>
# Set OS-limit on maximum number of open files/sockets (if 0, don't attempt to set) (restart required)
nofiles = <%= @config.dig(:relay, :nofiles) || "524288" %>
nofiles = <%= @config[:nofiles] || "524288" %>
# HTTP header that contains the client's real IP, before reverse proxying (ie x-real-ip) (MUST be all lower-case)
realIpHeader = "<%= @config.dig(:relay, :real_ip_header) || "" %>"
realIpHeader = "<%= @config[:real_ip_header] %>"
# NIP-11
info {
# Name of this server. Short/descriptive (< 30 characters)
name = "<%= @config.dig(:relay, :info, :name) || "strfry default" %>"
# NIP-11: Name of this server. Short/descriptive (< 30 characters)
name = "<%= @config[:info][:name] || "strfry default" %>"
# Detailed information about relay, free-form
description = "<%= @config.dig(:relay, :info, :description) || "This is a strfry instance." %>"
# NIP-11: Detailed information about relay, free-form
description = "<%= @config[:info][:description] || "This is a strfry instance." %>"
# Administrative nostr pubkey, for contact purposes
pubkey = "<%= @config.dig(:relay, :info, :pubkey) || "" %>"
# NIP-11: Administrative nostr pubkey, for contact purposes
pubkey = "<%= @config[:info][:pubkey] || "" %>"
# Alternative administrative contact (email, website, etc)
contact = "<%= @config.dig(:relay, :info, :contact) || "" %>"
# URL pointing to an image to be used as an icon for the relay
icon = "<%= @config.dig(:relay, :info, :icon) || "" %>"
# NIP-11: Alternative administrative contact (email, website, etc)
contact = "<%= @config[:info][:contact] || "" %>"
}
# Maximum accepted incoming websocket frame size (should be larger than max event) (restart required)
maxWebsocketPayloadSize = <%= @config.dig(:relay, :max_websocket_payload_size) || "131072" %>
maxWebsocketPayloadSize = 131072
# Websocket-level PING message frequency (should be less than any reverse proxy idle timeouts) (restart required)
autoPingSeconds = <%= @config.dig(:relay, :auto_ping_seconds) || "55" %>
autoPingSeconds = 55
# If TCP keep-alive should be enabled (detect dropped connections to upstream reverse proxy)
enableTcpKeepalive = <%= @config.dig(:relay, :enable_tcp_keepalive) || "false" %>
enableTcpKeepalive = false
# How much uninterrupted CPU time a REQ query should get during its DB scan
queryTimesliceBudgetMicroseconds = <%= @config.dig(:relay, :query_timeslice_budget_microseconds) || "10000" %>
queryTimesliceBudgetMicroseconds = 10000
# Maximum records that can be returned per filter
maxFilterLimit = <%= @config.dig(:relay, :max_filter_limit) || "500" %>
maxFilterLimit = 500
# Maximum number of subscriptions (concurrent REQs) a connection can have open at any time
maxSubsPerConnection = <%= @config.dig(:relay, :max_subs_per_connection) || "20" %>
maxSubsPerConnection = 20
writePolicy {
# If non-empty, path to an executable script that implements the writePolicy plugin logic
plugin = "<%= @config.dig(:relay, :write_policy, :plugin) || "" %>"
plugin = ""
}
compression {
# Use permessage-deflate compression if supported by client. Reduces bandwidth, but slight increase in CPU (restart required)
enabled = <%= @config.dig(:relay, :compression, :enabled) || "true" %>
enabled = true
# Maintain a sliding window buffer for each connection. Improves compression, but uses more memory (restart required)
slidingWindow = <%= @config.dig(:relay, :compression, :sliding_window) || "true" %>
slidingWindow = true
}
logging {
# Dump all incoming messages
dumpInAll = <%= @config.dig(:relay, :logging, :dump_in_all) || "false" %>
dumpInAll = false
# Dump all incoming EVENT messages
dumpInEvents = <%= @config.dig(:relay, :logging, :dump_in_events) || "false" %>
dumpInEvents = false
# Dump all incoming REQ/CLOSE messages
dumpInReqs = <%= @config.dig(:relay, :logging, :dump_in_reqs) || "false" %>
dumpInReqs = false
# Log performance metrics for initial REQ database scans
dbScanPerf = <%= @config.dig(:relay, :logging, :db_scan_perf) || "false" %>
dbScanPerf = false
# Log reason for invalid event rejection? Can be disabled to silence excessive logging
invalidEvents = <%= @config.dig(:relay, :logging, :invalid_events) || "true" %>
invalidEvents = true
}
numThreads {
# Ingester threads: route incoming requests, validate events/sigs (restart required)
ingester = <%= @config.dig(:relay, :num_threads, :ingester) || "3" %>
ingester = 3
# reqWorker threads: Handle initial DB scan for events (restart required)
reqWorker = <%= @config.dig(:relay, :num_threads, :req_worker) || "3" %>
reqWorker = 3
# reqMonitor threads: Handle filtering of new events (restart required)
reqMonitor = <%= @config.dig(:relay, :num_threads, :req_monitor) || "3" %>
reqMonitor = 3
# negentropy threads: Handle negentropy protocol messages (restart required)
negentropy = <%= @config.dig(:relay, :num_threads, :negentropy) || "2" %>
negentropy = 2
}
negentropy {
# Support negentropy protocol messages
enabled = <%= @config.dig(:relay, :negentropy, :enabled) || "true" %>
enabled = true
# Maximum records that sync will process before returning an error
maxSyncEvents = <%= @config.dig(:relay, :negentropy, :max_sync_events) || "1000000" %>
maxSyncEvents = 1000000
}
}

View File

@ -18,14 +18,13 @@ end
describe file('/etc/strfry.conf') do
it { should exist }
its('content') { should match(/name\s*=\s*"Test relay"/m) }
end
describe file('/var/lib/strfry') do
it { should be_directory }
end
describe port(7778) do
describe port(7777) do
it { should be_listening }
its('addresses') { should include '0.0.0.0' }
end