{"action":"created","comment":{"url":"https://api.github.com/repos/TheTorProject/ooni-backend/pulls/comments/62862609","id":62862609,"diff_hunk":"@@ -102,60 +102,71 @@\n     multiService.addService(http_return_request_helper)\n     http_return_request_helper.startService()\n \n-# add the tor collector service here\n+def getHSEndpoint(endpoint_config):\n+    hsdir = os.path.join(torconfig.DataDirectory, endpoint_config['hsdir'])","path":"oonib/oonibackend.py","position":23,"original_position":23,"commit_id":"2fa28488fc6dea793da147f9f1bd7a87961ec7a7","original_commit_id":"8ef4dc35b303d0b1e7d3e5ee0cc8a0f3e2eac240","user":{"login":"hellais","id":424620,"avatar_url":"https://avatars.githubusercontent.com/u/424620?v=3","gravatar_id":"","url":"https://api.github.com/users/hellais","html_url":"https://github.com/hellais","followers_url":"https://api.github.com/users/hellais/followers","following_url":"https://api.github.com/users/hellais/following{/other_user}","gists_url":"https://api.github.com/users/hellais/gists{/gist_id}","starred_url":"https://api.github.com/users/hellais/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hellais/subscriptions","organizations_url":"https://api.github.com/users/hellais/orgs","repos_url":"https://api.github.com/users/hellais/repos","events_url":"https://api.github.com/users/hellais/events{/privacy}","received_events_url":"https://api.github.com/users/hellais/received_events","type":"User","site_admin":false},"body":"The `tor_datadir` is actually just the directory where tor is instructed to store it's various files, but it's not really a requirement, nor is it how usually tor is configured, for the hidden service data files to reside in the tor data directory.\r\n\r\nI would say we could have a policy of these sorts:\r\n\r\n* If `hsdir` is set, then it should be considered as a path that is not relative to `tor_datadir`\r\n\r\n* If `hsdir` is not set, then we follow the legacy behaviour of setting the collector `hsdir` to `$tor_datadir/collector` and the bouncer `hsdir` to `$tor_datadir/bouncer`.","created_at":"2016-05-11T14:51:05Z","updated_at":"2016-05-11T14:51:05Z","html_url":"https://github.com/TheTorProject/ooni-backend/pull/69#discussion_r62862609","pull_request_url":"https://api.github.com/repos/TheTorProject/ooni-backend/pulls/69","_links":{"self":{"href":"https://api.github.com/repos/TheTorProject/ooni-backend/pulls/comments/62862609"},"html":{"href":"https://github.com/TheTorProject/ooni-backend/pull/69#discussion_r62862609"},"pull_request":{"href":"https://api.github.com/repos/TheTorProject/ooni-backend/pulls/69"}}},"pull_request":{"url":"https://api.github.com/repos/TheTorProject/ooni-backend/pulls/69","id":67644553,"html_url":"https://github.com/TheTorProject/ooni-backend/pull/69","diff_url":"https://github.com/TheTorProject/ooni-backend/pull/69.diff","patch_url":"https://github.com/TheTorProject/ooni-backend/pull/69.patch","issue_url":"https://api.github.com/repos/TheTorProject/ooni-backend/issues/69","number":69,"state":"open","locked":false,"title":"Add TLS endpoint","user":{"login":"joelanders","id":1390211,"avatar_url":"https://avatars.githubusercontent.com/u/1390211?v=3","gravatar_id":"","url":"https://api.github.com/users/joelanders","html_url":"https://github.com/joelanders","followers_url":"https://api.github.com/users/joelanders/followers","following_url":"https://api.github.com/users/joelanders/following{/other_user}","gists_url":"https://api.github.com/users/joelanders/gists{/gist_id}","starred_url":"https://api.github.com/users/joelanders/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/joelanders/subscriptions","organizations_url":"https://api.github.com/users/joelanders/orgs","repos_url":"https://api.github.com/users/joelanders/repos","events_url":"https://api.github.com/users/joelanders/events{/privacy}","received_events_url":"https://api.github.com/users/joelanders/received_events","type":"User","site_admin":false},"body":"Ok, I think this is all working.\r\nBe careful to hit the endping with an explicit `https`, eg: `https://localhost:whatever` as I wasted a bit of time on this :p","created_at":"2016-04-24T17:57:08Z","updated_at":"2016-05-11T14:51:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":"030382431e3a48b2e43cd589d1f3de8181b5b585","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/TheTorProject/ooni-backend/pulls/69/commits","review_comments_url":"https://api.github.com/repos/TheTorProject/ooni-backend/pulls/69/comments","review_comment_url":"https://api.github.com/repos/TheTorProject/ooni-backend/pulls/comments{/number}","comments_url":"https://api.github.com/repos/TheTorProject/ooni-backend/issues/69/comments","statuses_url":"https://api.github.com/repos/TheTorProject/ooni-backend/statuses/2fa28488fc6dea793da147f9f1bd7a87961ec7a7","head":{"label":"TheTorProject:feature/https_endpoint","ref":"feature/https_endpoint","sha":"2fa28488fc6dea793da147f9f1bd7a87961ec7a7","user":{"login":"TheTorProject","id":3301912,"avatar_url":"https://avatars.githubusercontent.com/u/3301912?v=3","gravatar_id":"","url":"https://api.github.com/users/TheTorProject","html_url":"https://github.com/TheTorProject","followers_url":"https://api.github.com/users/TheTorProject/followers","following_url":"https://api.github.com/users/TheTorProject/following{/other_user}","gists_url":"https://api.github.com/users/TheTorProject/gists{/gist_id}","starred_url":"https://api.github.com/users/TheTorProject/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/TheTorProject/subscriptions","organizations_url":"https://api.github.com/users/TheTorProject/orgs","repos_url":"https://api.github.com/users/TheTorProject/repos","events_url":"https://api.github.com/users/TheTorProject/events{/privacy}","received_events_url":"https://api.github.com/users/TheTorProject/received_events","type":"Organization","site_admin":false},"repo":{"id":8707973,"name":"ooni-backend","full_name":"TheTorProject/ooni-backend","owner":{"login":"TheTorProject","id":3301912,"avatar_url":"https://avatars.githubusercontent.com/u/3301912?v=3","gravatar_id":"","url":"https://api.github.com/users/TheTorProject","html_url":"https://github.com/TheTorProject","followers_url":"https://api.github.com/users/TheTorProject/followers","following_url":"https://api.github.com/users/TheTorProject/following{/other_user}","gists_url":"https://api.github.com/users/TheTorProject/gists{/gist_id}","starred_url":"https://api.github.com/users/TheTorProject/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/TheTorProject/subscriptions","organizations_url":"https://api.github.com/users/TheTorProject/orgs","repos_url":"https://api.github.com/users/TheTorProject/repos","events_url":"https://api.github.com/users/TheTorProject/events{/privacy}","received_events_url":"https://api.github.com/users/TheTorProject/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/TheTorProject/ooni-backend","description":"ooni-backend: the backend reporter and test helper for ooni-probe","fork":false,"url":"https://api.github.com/repos/TheTorProject/ooni-backend","forks_url":"https://api.github.com/repos/TheTorProject/ooni-backend/forks","keys_url":"https://api.github.com/repos/TheTorProject/ooni-backend/keys{/key_id}","collaborators_url":"https://api.github.com/repos/TheTorProject/ooni-backend/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/TheTorProject/ooni-backend/teams","hooks_url":"https://api.github.com/repos/TheTorProject/ooni-backend/hooks","issue_events_url":"https://api.github.com/repos/TheTorProject/ooni-backend/issues/events{/number}","events_url":"https://api.github.com/repos/TheTorProject/ooni-backend/events","assignees_url":"https://api.github.com/repos/TheTorProject/ooni-backend/assignees{/user}","branches_url":"https://api.github.com/repos/TheTorProject/ooni-backend/branches{/branch}","tags_url":"https://api.github.com/repos/TheTorProject/ooni-backend/tags","blobs_url":"https://api.github.com/repos/TheTorProject/ooni-backend/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/TheTorProject/ooni-backend/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/TheTorProject/ooni-backend/git/refs{/sha}","trees_url":"https://api.github.com/repos/TheTorProject/ooni-backend/git/trees{/sha}","statuses_url":"https://api.github.com/repos/TheTorProject/ooni-backend/statuses/{sha}","languages_url":"https://api.github.com/repos/TheTorProject/ooni-backend/languages","stargazers_url":"https://api.github.com/repos/TheTorProject/ooni-backend/stargazers","contributors_url":"https://api.github.com/repos/TheTorProject/ooni-backend/contributors","subscribers_url":"https://api.github.com/repos/TheTorProject/ooni-backend/subscribers","subscription_url":"https://api.github.com/repos/TheTorProject/ooni-backend/subscription","commits_url":"https://api.github.com/repos/TheTorProject/ooni-backend/commits{/sha}","git_commits_url":"https://api.github.com/repos/TheTorProject/ooni-backend/git/commits{/sha}","comments_url":"https://api.github.com/repos/TheTorProject/ooni-backend/comments{/number}","issue_comment_url":"https://api.github.com/repos/TheTorProject/ooni-backend/issues/comments{/number}","contents_url":"https://api.github.com/repos/TheTorProject/ooni-backend/contents/{+path}","compare_url":"https://api.github.com/repos/TheTorProject/ooni-backend/compare/{base}...{head}","merges_url":"https://api.github.com/repos/TheTorProject/ooni-backend/merges","archive_url":"https://api.github.com/repos/TheTorProject/ooni-backend/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/TheTorProject/ooni-backend/downloads","issues_url":"https://api.github.com/repos/TheTorProject/ooni-backend/issues{/number}","pulls_url":"https://api.github.com/repos/TheTorProject/ooni-backend/pulls{/number}","milestones_url":"https://api.github.com/repos/TheTorProject/ooni-backend/milestones{/number}","notifications_url":"https://api.github.com/repos/TheTorProject/ooni-backend/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/TheTorProject/ooni-backend/labels{/name}","releases_url":"https://api.github.com/repos/TheTorProject/ooni-backend/releases{/id}","deployments_url":"https://api.github.com/repos/TheTorProject/ooni-backend/deployments","created_at":"2013-03-11T16:37:48Z","updated_at":"2016-02-03T22:41:16Z","pushed_at":"2016-05-10T17:07:11Z","git_url":"git://github.com/TheTorProject/ooni-backend.git","ssh_url":"git@github.com:TheTorProject/ooni-backend.git","clone_url":"https://github.com/TheTorProject/ooni-backend.git","svn_url":"https://github.com/TheTorProject/ooni-backend","homepage":"","size":534,"stargazers_count":10,"watchers_count":10,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":15,"mirror_url":null,"open_issues_count":8,"forks":15,"open_issues":8,"watchers":10,"default_branch":"master"}},"base":{"label":"TheTorProject:master","ref":"master","sha":"6f1eb71d1ffb1652fb86da256fbe0897973c228f","user":{"login":"TheTorProject","id":3301912,"avatar_url":"https://avatars.githubusercontent.com/u/3301912?v=3","gravatar_id":"","url":"https://api.github.com/users/TheTorProject","html_url":"https://github.com/TheTorProject","followers_url":"https://api.github.com/users/TheTorProject/followers","following_url":"https://api.github.com/users/TheTorProject/following{/other_user}","gists_url":"https://api.github.com/users/TheTorProject/gists{/gist_id}","starred_url":"https://api.github.com/users/TheTorProject/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/TheTorProject/subscriptions","organizations_url":"https://api.github.com/users/TheTorProject/orgs","repos_url":"https://api.github.com/users/TheTorProject/repos","events_url":"https://api.github.com/users/TheTorProject/events{/privacy}","received_events_url":"https://api.github.com/users/TheTorProject/received_events","type":"Organization","site_admin":false},"repo":{"id":8707973,"name":"ooni-backend","full_name":"TheTorProject/ooni-backend","owner":{"login":"TheTorProject","id":3301912,"avatar_url":"https://avatars.githubusercontent.com/u/3301912?v=3","gravatar_id":"","url":"https://api.github.com/users/TheTorProject","html_url":"https://github.com/TheTorProject","followers_url":"https://api.github.com/users/TheTorProject/followers","following_url":"https://api.github.com/users/TheTorProject/following{/other_user}","gists_url":"https://api.github.com/users/TheTorProject/gists{/gist_id}","starred_url":"https://api.github.com/users/TheTorProject/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/TheTorProject/subscriptions","organizations_url":"https://api.github.com/users/TheTorProject/orgs","repos_url":"https://api.github.com/users/TheTorProject/repos","events_url":"https://api.github.com/users/TheTorProject/events{/privacy}","received_events_url":"https://api.github.com/users/TheTorProject/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/TheTorProject/ooni-backend","description":"ooni-backend: the backend reporter and test helper for ooni-probe","fork":false,"url":"https://api.github.com/repos/TheTorProject/ooni-backend","forks_url":"https://api.github.com/repos/TheTorProject/ooni-backend/forks","keys_url":"https://api.github.com/repos/TheTorProject/ooni-backend/keys{/key_id}","collaborators_url":"https://api.github.com/repos/TheTorProject/ooni-backend/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/TheTorProject/ooni-backend/teams","hooks_url":"https://api.github.com/repos/TheTorProject/ooni-backend/hooks","issue_events_url":"https://api.github.com/repos/TheTorProject/ooni-backend/issues/events{/number}","events_url":"https://api.github.com/repos/TheTorProject/ooni-backend/events","assignees_url":"https://api.github.com/repos/TheTorProject/ooni-backend/assignees{/user}","branches_url":"https://api.github.com/repos/TheTorProject/ooni-backend/branches{/branch}","tags_url":"https://api.github.com/repos/TheTorProject/ooni-backend/tags","blobs_url":"https://api.github.com/repos/TheTorProject/ooni-backend/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/TheTorProject/ooni-backend/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/TheTorProject/ooni-backend/git/refs{/sha}","trees_url":"https://api.github.com/repos/TheTorProject/ooni-backend/git/trees{/sha}","statuses_url":"https://api.github.com/repos/TheTorProject/ooni-backend/statuses/{sha}","languages_url":"https://api.github.com/repos/TheTorProject/ooni-backend/languages","stargazers_url":"https://api.github.com/repos/TheTorProject/ooni-backend/stargazers","contributors_url":"https://api.github.com/repos/TheTorProject/ooni-backend/contributors","subscribers_url":"https://api.github.com/repos/TheTorProject/ooni-backend/subscribers","subscription_url":"https://api.github.com/repos/TheTorProject/ooni-backend/subscription","commits_url":"https://api.github.com/repos/TheTorProject/ooni-backend/commits{/sha}","git_commits_url":"https://api.github.com/repos/TheTorProject/ooni-backend/git/commits{/sha}","comments_url":"https://api.github.com/repos/TheTorProject/ooni-backend/comments{/number}","issue_comment_url":"https://api.github.com/repos/TheTorProject/ooni-backend/issues/comments{/number}","contents_url":"https://api.github.com/repos/TheTorProject/ooni-backend/contents/{+path}","compare_url":"https://api.github.com/repos/TheTorProject/ooni-backend/compare/{base}...{head}","merges_url":"https://api.github.com/repos/TheTorProject/ooni-backend/merges","archive_url":"https://api.github.com/repos/TheTorProject/ooni-backend/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/TheTorProject/ooni-backend/downloads","issues_url":"https://api.github.com/repos/TheTorProject/ooni-backend/issues{/number}","pulls_url":"https://api.github.com/repos/TheTorProject/ooni-backend/pulls{/number}","milestones_url":"https://api.github.com/repos/TheTorProject/ooni-backend/milestones{/number}","notifications_url":"https://api.github.com/repos/TheTorProject/ooni-backend/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/TheTorProject/ooni-backend/labels{/name}","releases_url":"https://api.github.com/repos/TheTorProject/ooni-backend/releases{/id}","deployments_url":"https://api.github.com/repos/TheTorProject/ooni-backend/deployments","created_at":"2013-03-11T16:37:48Z","updated_at":"2016-02-03T22:41:16Z","pushed_at":"2016-05-10T17:07:11Z","git_url":"git://github.com/TheTorProject/ooni-backend.git","ssh_url":"git@github.com:TheTorProject/ooni-backend.git","clone_url":"https://github.com/TheTorProject/ooni-backend.git","svn_url":"https://github.com/TheTorProject/ooni-backend","homepage":"","size":534,"stargazers_count":10,"watchers_count":10,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":15,"mirror_url":null,"open_issues_count":8,"forks":15,"open_issues":8,"watchers":10,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/TheTorProject/ooni-backend/pulls/69"},"html":{"href":"https://github.com/TheTorProject/ooni-backend/pull/69"},"issue":{"href":"https://api.github.com/repos/TheTorProject/ooni-backend/issues/69"},"comments":{"href":"https://api.github.com/repos/TheTorProject/ooni-backend/issues/69/comments"},"review_comments":{"href":"https://api.github.com/repos/TheTorProject/ooni-backend/pulls/69/comments"},"review_comment":{"href":"https://api.github.com/repos/TheTorProject/ooni-backend/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/TheTorProject/ooni-backend/pulls/69/commits"},"statuses":{"href":"https://api.github.com/repos/TheTorProject/ooni-backend/statuses/2fa28488fc6dea793da147f9f1bd7a87961ec7a7"}}}}