From 36d00ead33c1040c64a2377f125c89e9e553869b Mon Sep 17 00:00:00 2001
From: Adam Moore <laemeur@sdf.org>
Date: Tue, 10 Feb 2015 16:36:32 -0800
Subject: [PATCH] Webfinger instructions were incomplete/erroneous -- now they
 are not.

---
 socialfy-your-domain/README.txt               | 28 ++++++++++-----
 socialfy-your-domain/dot-well-known/host-meta |  9 ++++-
 .../xrd/example@example.com.xml               | 35 +++++++++++++++++++
 3 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 socialfy-your-domain/xrd/example@example.com.xml

diff --git a/socialfy-your-domain/README.txt b/socialfy-your-domain/README.txt
index ead4380f21..53d44ce322 100644
--- a/socialfy-your-domain/README.txt
+++ b/socialfy-your-domain/README.txt
@@ -24,7 +24,7 @@ $s = "";
 
 This can be anything you like...
 
-$s = "johnny-five";
+$s = "johnny5";
 
 or 
 
@@ -32,23 +32,33 @@ $s = "12345";
 
 It really doesn't matter too much.
 
+
 Step 3
 ======
 
+Edit the .well-known/host-meta file and replace all occurrences of
+"example.com" with your domain name.
+
+Step 4
+======
+
 For each user on your site, and this might only be you...
 
-Make a copy of the example@example.com.xml file so that it's called...
+In the xrd directory, make a copy of the example@example.com.xml file
+so that it's called...
 
      yoursecretusername@domain.com.xml
 
-     So, if your secret is 'johnny5' and your name is ben and your
-     domain is titanictoycorp.biz, your file should be called
-     johnny5ben@titanictoycorp.biz.xml
+So, if your secret from step 2 is 'johnny5' and your name is 'ben' and
+your domain is 'titanictoycorp.biz', your file should be called
+johnny5ben@titanictoycorp.biz.xml
 
-Finally, edit the file to point at your account on your social
-site. If you are the only user, then you probably don't need to worry
-about user/1 as this will be you. For multi user sites, the user ID is
-on the profile page.
+Then edit the file, replacing "social.example.com" with your GNU
+social instance's base path, and change the user ID number (and
+nickname for the FOAF link) to that of your account on your social
+site. If you don't know your user ID number, you can see this on your
+GNU social profile page by looking at the destination URLs in the
+Feeds links.
 
 Finally
 =======
diff --git a/socialfy-your-domain/dot-well-known/host-meta b/socialfy-your-domain/dot-well-known/host-meta
index a8d9fe0284..1929b2eb8e 100644
--- a/socialfy-your-domain/dot-well-known/host-meta
+++ b/socialfy-your-domain/dot-well-known/host-meta
@@ -1 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0" xmlns:hm="http://host-meta.net/xrd/1.0"><hm:Host>example.com</hm:Host><Link rel="lrdd" template="http://example.com/.well-known/webfinger?resource={uri}"><Title>WebFinger resource descriptor</Title></Link></XRD>
+<?xml version="1.0" encoding="UTF-8"?>
+<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"
+     xmlns:hm="http://host-meta.net/xrd/1.0">  
+  <hm:Host>example.com</hm:Host>
+  <Link rel="lrdd" template="http://example.com/.well-known/xrd?uri={uri}">
+    <Title>WebFinger resource descriptor</Title>
+  </Link>
+</XRD>
diff --git a/socialfy-your-domain/xrd/example@example.com.xml b/socialfy-your-domain/xrd/example@example.com.xml
new file mode 100644
index 0000000000..b713efe95b
--- /dev/null
+++ b/socialfy-your-domain/xrd/example@example.com.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+  <Subject>acct:example@example.com</Subject>
+  <Alias>acct:example@social.example.com</Alias>
+  <Alias>http://social.example.com/user/1</Alias>
+  <Link rel="http://webfinger.net/rel/profile-page"
+        type="text/html"
+	href="http://social.example.com/user/1"/>
+    
+  <Link rel="http://schemas.google.com/g/2010#updates-from"
+	type="application/atom+xml"
+	href="http://social.example.com/api/statuses/user_timeline/1.atom"/>
+    
+  <!-- Is this/was this ever supported?
+       <Link rel="http://microformats.org/profile/hcard"
+       type="text/html"
+       href="http://social.example.com/hcard"/> -->
+  
+  <Link rel="http://gmpg.org/xfn/11"
+	type="text/html"
+	href="http://social.example.com/user/1"/>
+    
+  <Link rel="describedby"
+	type="application/rdf+xml"
+	href="http://social.example.com/username/foaf"/>
+
+  <Link rel="http://salmon-protocol.org/ns/salmon-replies"
+	href="http://social.example.com/main/salmon/user/1"/>
+    
+  <Link rel="http://salmon-protocol.org/ns/salmon-mention"
+	href="http://social.example.com/main/salmon/user/1"/>
+    
+  <Link rel="http://ostatus.org/schema/1.0/subscribe"
+	template="http://social.example.com/main/ostatussub?profile={uri}"/>
+</XRD>