Merge commit 'refs/merge-requests/43' of https://gitorious.org/social/mainline into merge-requests/43

This commit is contained in:
Mikael Nordfeldth 2015-02-12 11:03:39 +01:00
commit 2688b45b57
4 changed files with 62 additions and 24 deletions

View File

@ -24,7 +24,7 @@ $s = "";
This can be anything you like... This can be anything you like...
$s = "johnny-five"; $s = "johnny5";
or or
@ -32,23 +32,33 @@ $s = "12345";
It really doesn't matter too much. It really doesn't matter too much.
Step 3 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... 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 yoursecretusername@domain.com.xml
So, if your secret is 'johnny5' and your name is ben and your So, if your secret from step 2 is 'johnny5' and your name is 'ben' and
domain is titanictoycorp.biz, your file should be called your domain is 'titanictoycorp.biz', your file should be called
johnny5ben@titanictoycorp.biz.xml johnny5ben@titanictoycorp.biz.xml
Finally, edit the file to point at your account on your social Then edit the file, replacing "social.example.com" with your GNU
site. If you are the only user, then you probably don't need to worry social instance's base path, and change the user ID number (and
about user/1 as this will be you. For multi user sites, the user ID is nickname for the FOAF link) to that of your account on your social
on the profile page. 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 Finally
======= =======

View File

@ -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>

View File

@ -1,14 +0,0 @@
<?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"/>
<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/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>

View File

@ -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>