Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • pleroma pleroma
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 648
    • Issues 648
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 90
    • Merge requests 90
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • PleromaPleroma
  • pleromapleroma
  • Merge requests
  • !294

Separate webfinger domain from host domain

  • Review changes

  • Download
  • Email patches
  • Plain diff
Closed uiri requested to merge uiri/pleroma:domains into develop Aug 25, 2018
  • Overview 12
  • Commits 3
  • Pipelines 3
  • Changes 2

This addresses the first part of #201 (closed)

The existing Pleroma.Web.Endpoint host config is equivalent to Mastodon's WEB_DOMAIN. This adds a new config option under Pleroma.Web.Endpoint called domain that is equivalent to Mastodon's LOCAL_DOMAIN.

This PR also modifies webfinger to:

  1. Return the same data for username @ WEB_DOMAIN and for username @ LOCAL_DOMAIN
    Resolving username @ WEB_DOMAIN is necessary because AP servers will use that domain for look up in some situations.
  2. Return username @ LOCAL_DOMAIN as the Subject for both JSON and XML response formats.
    This appears to be the field that Mastodon uses to populate user handles.
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: domains