Add relay icon

attributes/default.rb

@@ -1,5 +1,5 @@
 node.default["strfry"]["repo"] = "https://github.com/hoytech/strfry.git"
-node.default["strfry"]["revision"] = "master"
+node.default["strfry"]["revision"] = "1.0.1"
 node.default["strfry"]["download_url"] = nil
 node.default["strfry"]["checksum"] = nil
 node.default["strfry"]["user"] = "strfry"
@@ -8,3 +8,4 @@ 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"] = {}
+node.default["strfry"]["policy_path"] = ""

recipes/default.rb

@@ -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,8 +55,8 @@ group node["strfry"]["group"]
 
 user node["strfry"]["user"] do
   gid node["strfry"]["group"]
-  manage_home false
-  shell "/usr/sbin/nologin"
+  manage_home true
+  shell "/bin/bash"
 end
 
 directory node["strfry"]["db_path"] do
@@ -76,7 +76,8 @@ template "/etc/strfry.conf" do
     real_ip_header: node["strfry"]["real_ip_header"],
     port: node["strfry"]["port"],
     nofiles: node["strfry"]["nofiles"],
-    info: node["strfry"]["info"]
+    info: node["strfry"]["info"],
+    policy_path: node["strfry"]["policy_path"]
   }
   notifies :restart, "service[strfry]", :delayed
 end
@@ -97,7 +98,7 @@ systemd_unit "strfry.service" do
       ExecStart: "/usr/local/bin/strfry relay",
       Restart: "on-failure",
       RestartSec: "5",
-      ProtectHome: "yes",
+      ProtectHome: "no",
       NoNewPrivileges: "yes",
       ProtectSystem: "full",
       LimitCORE: "1000000000"

templates/default/strfry.conf.erb

@@ -48,18 +48,22 @@ relay {
     # HTTP header that contains the client's real IP, before reverse proxying (ie x-real-ip) (MUST be all lower-case)
     realIpHeader = "<%= @config[:real_ip_header] %>"
 
+    # NIP-11
     info {
-        # NIP-11: Name of this server. Short/descriptive (< 30 characters)
+        # Name of this server. Short/descriptive (< 30 characters)
         name = "<%= @config[:info][:name] || "strfry default" %>"
 
-        # NIP-11: Detailed information about relay, free-form
+        # Detailed information about relay, free-form
         description = "<%= @config[:info][:description] || "This is a strfry instance." %>"
 
-        # NIP-11: Administrative nostr pubkey, for contact purposes
+        # Administrative nostr pubkey, for contact purposes
         pubkey = "<%= @config[:info][:pubkey] || "" %>"
 
-        # NIP-11: Alternative administrative contact (email, website, etc)
+        # Alternative administrative contact (email, website, etc)
         contact = "<%= @config[:info][:contact] || "" %>"
+
+        # URL pointing to an image to be used as an icon for the relay
+        icon = "<%= @config[:info][:icon] || "" %>"
     }
 
     # Maximum accepted incoming websocket frame size (should be larger than max event) (restart required)
@@ -82,7 +86,7 @@ relay {
 
     writePolicy {
         # If non-empty, path to an executable script that implements the writePolicy plugin logic
-        plugin = ""
+        plugin = "<%= @config[:policy_path] %>"
     }
 
     compression {
@@ -95,7 +99,7 @@ relay {
 
     logging {
         # Dump all incoming messages
-        dumpInAll = false
+        dumpInAll = true
 
         # Dump all incoming EVENT messages
         dumpInEvents = false