Skip to content

Upgrade unipi to paf-le-chien #4

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.

Sign up for GitHub

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

Closed
dinosaure wants to merge 4 commits into from
Closed

Upgrade unipi to paf-le-chien #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cac72a
Upgrade unipi to paf-le-chien
dinosaure Jun 21, 2021
6e85aea
.
dinosaure Jun 24, 2021
0ab8cc8
Update unipi with the last version of git-paf/paf
dinosaure Jul 21, 2021
6a5ccac
minor adjustments
hannesm Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 25 additions & 41 deletions config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
open Mirage

(* boilerplate from https://github.com/mirage/ocaml-git.git unikernel/config.ml
(commit #3bfcf215f959b71580e5c0b655700bb9484aee8c) *)
(* boilerplate from https://github.com/mirage/ocaml-git.git
file unikernel/empty-commit/config.ml
commit #ecdfc6dc13834f5f1a8e378718512eda6e67c982 *)
type mimic = Mimic

let mimic = typ Mimic
Expand Down Expand Up @@ -88,13 +89,13 @@ let mimic_dns_conf =
let packages = [ package "git-mirage" ~sublibs:[ "dns" ] ] in
impl @@ object
inherit base_configurable
method ty = random @-> mclock @-> time @-> stackv4v6 @-> mimic @-> mimic
method ty = random @-> mclock @-> pclock @-> time @-> stackv4v6 @-> mimic @-> mimic
method module_name = "Git_mirage_dns.Make"
method! packages = Key.pure packages
method name = "dns_ctx"
method! connect _ modname =
function
| [ _; _; _; stack; tcp_ctx ] ->
| [ _; _; _; _; stack; tcp_ctx ] ->
Fmt.str
{ocaml|let dns_ctx00 = Mimic.merge %s %s.ctx in
let dns_ctx01 = %s.with_dns %s dns_ctx00 in
Expand All @@ -104,47 +105,31 @@ let mimic_dns_conf =
| _ -> assert false
end

let mimic_dns_impl random mclock time stackv4v6 mimic_tcp =
mimic_dns_conf $ random $ mclock $ time $ stackv4v6 $ mimic_tcp

type paf = Paf
let paf = typ Paf

let paf_conf () =
let packages = [ package "paf" ~sublibs:[ "mirage" ] ] in
impl @@ object
inherit base_configurable
method ty = time @-> stackv4v6 @-> paf
method module_name = "Paf_mirage.Make"
method! packages = Key.pure packages
method name = "paf"
end

let paf_impl time stackv4v6 = paf_conf () $ time $ stackv4v6
let mimic_dns_impl random mclock pclock time stackv4v6 mimic_tcp =
mimic_dns_conf $ random $ mclock $ pclock $ time $ stackv4v6 $ mimic_tcp

let mimic_paf_conf () =
let packages = [ package "git-paf" ] in
impl @@ object
inherit base_configurable
method ty = time @-> pclock @-> stackv4v6 @-> paf @-> mimic @-> mimic
method ty = time @-> pclock @-> stackv4v6 @-> mimic @-> mimic
method module_name = "Git_paf.Make"
method! packages = Key.pure packages
method name = "paf_ctx"
method! connect _ modname = function
| [ _; _; _; _; tcp_ctx; ] ->
| [ _; _; _; tcp_ctx; ] ->
Fmt.str
{ocaml|let paf_ctx00 = Mimic.merge %s %s.ctx in
Lwt.return paf_ctx00|ocaml}
tcp_ctx modname
| _ -> assert false
end

let mimic_paf_impl time pclock stackv4v6 paf mimic_tcp =
let mimic_paf_impl time pclock stackv4v6 mimic_tcp =
mimic_paf_conf ()
$ time
$ pclock
$ stackv4v6
$ paf
$ mimic_tcp
(* --- end of copied code --- *)

Expand Down Expand Up @@ -197,36 +182,33 @@ let email =
Key.(create "email" Arg.(opt (some string) None doc))

let packages = [
package ~min:"2.6.0" "irmin";
package ~min:"2.6.0" "irmin-mirage";
package ~min:"2.6.0" "irmin-mirage-git";
package "cohttp-mirage";
package ~min:"3.5.0" "git-paf";
package ~min:"3.5.0" "git";
package ~min:"3.5.0" "git-mirage";
package ~min:"2.8.0" ~max:"3.0.0" "irmin-mirage-git";
package "tls-mirage";
package "magic-mime";
package "logs";
package "awa";
package "awa-mirage";
package ~min:"3.4.0" "git-mirage";
package ~min:"0.2.5" "letsencrypt";
package ~min:"3.6.0" ~max:"3.7.0" "git-mirage";
package ~min:"0.3.0" "letsencrypt";
package "paf" ~min:"0.0.6" ~sublibs:[ "mirage" ];
package "paf-le";
]

let stack = generic_stackv4v6 default_network

let mimic_impl ~kind ~seed ~authenticator stackv4v6 random mclock pclock time paf =
let mimic_impl ~kind ~seed ~authenticator stackv4v6 random mclock pclock time =
let mtcp = mimic_tcp_impl stackv4v6 in
let mdns = mimic_dns_impl random mclock time stackv4v6 mtcp in
let mdns = mimic_dns_impl random mclock pclock time stackv4v6 mtcp in
let mssh = mimic_ssh_impl ~kind ~seed ~auth:authenticator stackv4v6 mtcp mclock in
let mpaf = mimic_paf_impl time pclock stackv4v6 paf mtcp in
let mpaf = mimic_paf_impl time pclock stackv4v6 mtcp in
merge mpaf (merge mssh mdns)

let mimic_impl =
mimic_impl ~kind:`Rsa ~seed:ssh_seed ~authenticator:ssh_authenticator stack
default_random default_monotonic_clock default_posix_clock default_time
(paf_impl default_time stack)

let conduit_ = conduit_direct ~tls:true stack
let http_srv = cohttp_server conduit_
let http_cli = cohttp_client (resolver_dns stack) conduit_

let () =
let keys = Key.([
Expand All @@ -242,9 +224,11 @@ let () =
~keys
~packages
"Unikernel.Main"
(mimic @-> http_client @-> http @-> pclock @-> time @-> job)
(mimic @-> random @-> mclock @-> pclock @-> time @-> stackv4v6 @-> job)
$ mimic_impl
$ http_cli $ http_srv
$ default_random
$ default_monotonic_clock
$ default_posix_clock
$ default_time
$ stack
]
Loading