/Canopy

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TLS support #15

Merged
merged 3 commits into from Apr 14, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@hannesm @Engil
@hannesm
Collaborator

hannesm commented Apr 9, 2016

No description provided.

hannesm added some commits Apr 9, 2016

@hannesm
empty tls directory
3b1dab5
@hannesm
use created as published timestamp
93fce71
@hannesm
TLS support; 
- move dispatch logic to Canopy_dispatch
- provide --tls_port configuration option
- if tls_port is provided, redirect HTTP requests to HTTPS
- Conduit_mirage.http never returns, but we (might) need several
  listeners, thus use `listen_tcpv4` and `listen` on our own
- Conduit still used by Irmin to fetch the git remote
- move atom feed into Canopy_syndic
Loading status checks…
bb796f3
@hannesm

This comment has been minimized.

Sign in to view
Collaborator

hannesm commented Apr 9, 2016

inspiration came from mirage-www (which afaics is a bit overcomplicated) amongst other repositories... (the interesting bit is that conduit does not provide anything to just listen on port x, and continue with code to listen on port y and z)... thus doing this manually for now
@hannesm

This comment has been minimized.

Sign in to view
Collaborator

hannesm commented Apr 9, 2016

(and this is live at http://hannes.nqsb.io / https://hannes.nqsb.io - push also works :))
canopy_dispatch.ml
subkeys : string list -> string list list Lwt.t ;
value : string list -> string option Lwt.t ;
update : unit -> string list Lwt.t
}

This comment has been minimized.

Sign in to view
Copy link
@hannesm

hannesm Apr 9, 2016

Collaborator

this is the piece I'm not happy abou... but I failed to properly construct te module Store and pass it to Canopy_dispatch...

This comment has been minimized.

Sign in to view
Copy link
@Engil

Engil Apr 12, 2016

Owner

That'll do for know, I have an idea on how to this but that's fine enough like this for the moment. :)

@hannesm hannesm referenced this pull request Apr 14, 2016

Closed

issue #2: Mime type handling #18

@hannesm

This comment has been minimized.

Sign in to view
Collaborator

hannesm commented Apr 14, 2016

what's holding you off from merging?
@Engil

This comment has been minimized.

Sign in to view
Owner

Engil commented Apr 14, 2016

I was not too sure if you were going to add documentation (as discussed this weekend) but that can come later I guess. :)
I'll merge right away if you want, everything looks good to me. :)
@hannesm

This comment has been minimized.

Sign in to view
Collaborator

hannesm commented Apr 14, 2016

pls merge, I'll provide docs later today :)
@Engil

This comment has been minimized.

Sign in to view
Owner

Engil commented Apr 14, 2016

Ok!
Thank you for your hard work, merged. :)

@Engil Engil closed this Apr 14, 2016

@Engil Engil reopened this Apr 14, 2016

@Engil Engil merged commit 5679f5b into Engil:master Apr 14, 2016
1 check was pending

1 check was pending

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details

@hannesm hannesm deleted the hannesm:tls branch Apr 14, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment