Merge remote-tracking branch 'origin/news_upgrade_to_1.0.3' into news

mplorentz · mplorentz · commit 2b4fa054c61b · 2025-01-03T16:42:15.000-05:00
diff --git a/Dockerfile b/Dockerfile
@@ -16,7 +16,7 @@ RUN apt update && apt install -y --no-install-recommends \
     libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev \
     liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev curl build-essential
 
-RUN git clone --branch 0.9.6 https://github.com/hoytech/strfry.git && \
+RUN git clone --depth 1 --branch 1.0.3 https://github.com/hoytech/strfry.git && \
     cd strfry/ && \
     git submodule update --init && \
     make setup-golpe && \
diff --git a/strfry/config/strfry.conf b/strfry/config/strfry.conf
@@ -38,6 +38,9 @@ relay {
 
         # NIP-11: Alternative administrative contact (email, website, etc)
         contact = "support@nos.social"
+
+        # List of supported lists as JSON array, or empty string to use default. Example: [1,2]
+        nips = "[1,2,4,9,11,12,16,20,22,28,33,40,62]"
     }
 
     # Maximum accepted incoming websocket frame size (should be larger than max event and yesstr msg) (restart required)

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ relay {`
`38`	`38`
`39`	`39`	`# NIP-11: Alternative administrative contact (email, website, etc)`
`40`	`40`	`contact = "support@nos.social"`
	`41`	`+`
	`42`	`+ # List of supported lists as JSON array, or empty string to use default. Example: [1,2]`
	`43`	`+ nips = "[1,2,4,9,11,12,16,20,22,28,33,40,62]"`
`41`	`44`	`}`
`42`	`45`
`43`	`46`	`# Maximum accepted incoming websocket frame size (should be larger than max event and yesstr msg) (restart required)`