Kristian Fiskerstrand avatar Kristian Fiskerstrand committed a66d155 Merge

merge

Comments (0)

Files changed (4)

 let hostname = ref (Unix.gethostname ())
 let set_hostname value = hostname := value
 
+let nodename = ref (Unix.gethostname ())
+let set_nodename value = nodename := value
+
 let server_contact = ref ""
 let set_server_contact value = server_contact := value
 
        "in one shot");
     ("-seed", Arg.Int set_seed, " Seed used by RNG");
     ("-hostname", Arg.String set_hostname, " current hostname");
+    ("-nodename", Arg.String set_nodename, " current nodename");
     ("-d", Arg.Int set_drop, " Number of keys to drop at random " ^
        "when synchronizing");
     ("-n", Arg.Int set_n, " Number of key dump files to load at once " ^
 val ptree_pagesize : int option ref
 val set_ptree_pagesize : int -> unit
 val hostname : string ref
+val nodename : string ref
 val server_contact : string ref
 val set_hostname : string -> unit
 val filelog : bool ref
       "<h2>Settings</h2>
      <table summary=\"Keyserver Settings\">
      <tr><td>Hostname:</td><td>%s</td></tr>
+     <tr><td>Nodename:</td><td>%s</td></tr>
      <tr><td>Version:</td><td>%s%s</td></tr>
      <tr><td>Server contact:</td><td>%s</td></tr>
      <tr><td>HTTP port:</td><td>%d</td></tr>
      <tr><td>Recon port:</td><td>%d</td></tr>
      <tr><td>Debug level:</td><td>%d</td></tr>
 </table>\r\n"
-      !Settings.hostname Common.version Common.version_suffix
+      !Settings.hostname !Settings.nodename Common.version Common.version_suffix
       !Settings.server_contact http_port recon_port !Settings.debuglevel
   in
   let gossip_peers =
     let split = Str.regexp_string "." in
     let major_minor_string major minor =
       sprintf "Further details about the BDB environment can be seen by \
-	  executing db%s.%s_stat -x in the KDB and Ptree directories\n" major minor
+	  executing\ndb%s.%s_stat -x in the KDB and Ptree directories\n" major minor
     in
     match Str.split split bdb_version with
     | major :: minor :: _ -> major_minor_string major minor
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.