about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2019-12-20T20·18+0000
committerVincent Ambo <tazjin@google.com>2019-12-20T20·18+0000
commit03bfe08e1dd9faf48b06cb146bfa446575cde88a (patch)
tree55317968922a9b2a01516f1b79527874df037517
parente52eed3cd4f73779c2e7c350537fb346835ba9f3 (diff)
chore: Significantly restructure folder layout r/237
This moves the various projects from "type-based" folders (such as
"services" or "tools") into more appropriate semantic folders (such as
"nix", "ops" or "web").

Deprecated projects (nixcon-demo & gotest) which only existed for
testing/demonstration purposes have been removed.

(Note: *all* builds are broken with this commit)
-rwxr-xr-xbin/__dispatch.sh (renamed from tools/bin/__dispatch.sh)2
l---------bin/aoc2019 (renamed from tools/bin/aoc2019)0
l---------bin/blog_cli (renamed from tools/bin/blog_cli)0
l---------bin/kms_pass (renamed from tools/bin/kms_pass)0
l---------bin/kontemplate (renamed from tools/bin/kontemplate)0
l---------bin/rink (renamed from tools/bin/rink)0
l---------bin/stern (renamed from tools/bin/stern)0
l---------bin/terraform (renamed from tools/bin/terraform)0
-rw-r--r--docs/CODE_OF_CONDUCT.md (renamed from CODE_OF_CONDUCT.md)0
-rw-r--r--docs/CONTRIBUTING.md (renamed from CONTRIBUTING.md)0
-rw-r--r--fun/aoc2019/default.nix (renamed from tools/aoc2019/default.nix)0
-rw-r--r--fun/aoc2019/solution-day1.el (renamed from tools/aoc2019/solution-day1.el)0
-rw-r--r--fun/aoc2019/solution-day2.el (renamed from tools/aoc2019/solution-day2.el)0
-rw-r--r--fun/aoc2019/solution-day3.el (renamed from tools/aoc2019/solution-day3.el)0
-rw-r--r--fun/aoc2019/solution-day4.el (renamed from tools/aoc2019/solution-day4.el)0
-rw-r--r--fun/gemma/CODE_OF_CONDUCT.md (renamed from services/gemma/CODE_OF_CONDUCT.md)0
-rw-r--r--fun/gemma/LICENSE (renamed from services/gemma/LICENSE)0
-rw-r--r--fun/gemma/README.markdown (renamed from services/gemma/README.markdown)0
-rw-r--r--fun/gemma/build.lisp (renamed from services/gemma/build.lisp)0
-rw-r--r--fun/gemma/config.lisp (renamed from services/gemma/config.lisp)0
-rw-r--r--fun/gemma/default.nix (renamed from services/gemma/default.nix)0
-rw-r--r--fun/gemma/frontend/Main.elm (renamed from services/gemma/frontend/Main.elm)0
-rw-r--r--fun/gemma/frontend/elm-package.json (renamed from services/gemma/frontend/elm-package.json)0
-rw-r--r--fun/gemma/gemma.asd (renamed from services/gemma/gemma.asd)0
-rw-r--r--fun/gemma/src/gemma.lisp (renamed from services/gemma/src/gemma.lisp)0
-rw-r--r--nix/buildGo/.skip-subtree (renamed from overrides/buildGo/.skip-subtree)0
-rw-r--r--nix/buildGo/README.md (renamed from overrides/buildGo/README.md)0
-rw-r--r--nix/buildGo/default.nix (renamed from overrides/buildGo/default.nix)0
-rw-r--r--nix/buildGo/example/default.nix (renamed from overrides/buildGo/example/default.nix)0
-rw-r--r--nix/buildGo/example/lib.go (renamed from overrides/buildGo/example/lib.go)0
-rw-r--r--nix/buildGo/example/main.go (renamed from overrides/buildGo/example/main.go)0
-rw-r--r--nix/buildGo/example/thing.proto (renamed from overrides/buildGo/example/thing.proto)0
-rw-r--r--nix/buildGo/external/default.nix (renamed from overrides/buildGo/external/default.nix)0
-rw-r--r--nix/buildGo/external/main.go (renamed from overrides/buildGo/external/main.go)0
-rw-r--r--nix/buildGo/proto.nix (renamed from overrides/buildGo/proto.nix)0
-rwxr-xr-xops/infra/dns/import (renamed from infra/dns/import)0
-rw-r--r--ops/infra/dns/kontemplate-works (renamed from infra/dns/kontemplate-works)0
-rw-r--r--ops/infra/dns/oslo-pub (renamed from infra/dns/oslo-pub)0
-rw-r--r--ops/infra/dns/root-tazj-in (renamed from infra/dns/root-tazj-in)0
-rw-r--r--ops/infra/gcp/.gitignore (renamed from infra/gcp/.gitignore)0
-rw-r--r--ops/infra/gcp/default.tf (renamed from infra/gcp/default.tf)0
-rw-r--r--ops/infra/kubernetes/cgit/config.yaml (renamed from infra/kubernetes/cgit/config.yaml)0
-rw-r--r--ops/infra/kubernetes/gemma/config.lisp (renamed from infra/kubernetes/gemma/config.lisp)0
-rw-r--r--ops/infra/kubernetes/https-cert/cert.yaml (renamed from infra/kubernetes/https-cert/cert.yaml)0
-rw-r--r--ops/infra/kubernetes/https-lb/ingress.yaml (renamed from infra/kubernetes/https-lb/ingress.yaml)0
-rw-r--r--ops/infra/kubernetes/nginx/nginx.conf (renamed from infra/kubernetes/nginx/nginx.conf)0
-rw-r--r--ops/infra/kubernetes/nginx/nginx.yaml (renamed from infra/kubernetes/nginx/nginx.yaml)0
-rw-r--r--ops/infra/kubernetes/nixery/config.yaml (renamed from infra/kubernetes/nixery/config.yaml)0
-rw-r--r--ops/infra/kubernetes/nixery/id_nixery.pub (renamed from infra/kubernetes/nixery/id_nixery.pub)0
-rw-r--r--ops/infra/kubernetes/nixery/known_hosts (renamed from infra/kubernetes/nixery/known_hosts)0
-rw-r--r--ops/infra/kubernetes/nixery/secrets.yaml (renamed from infra/kubernetes/nixery/secrets.yaml)0
-rw-r--r--ops/infra/kubernetes/nixery/ssh_config (renamed from infra/kubernetes/nixery/ssh_config)0
-rw-r--r--ops/infra/kubernetes/primary-cluster.yaml (renamed from infra/kubernetes/primary-cluster.yaml)0
-rw-r--r--ops/infra/kubernetes/tazblog/config.yaml (renamed from infra/kubernetes/tazblog/config.yaml)0
-rw-r--r--ops/infra/nixos/.gitignore (renamed from infra/nixos/.gitignore)0
-rw-r--r--ops/infra/nixos/README.md (renamed from infra/nixos/README.md)0
-rw-r--r--ops/infra/nixos/adho-configuration.nix (renamed from infra/nixos/adho-configuration.nix)0
-rw-r--r--ops/infra/nixos/configuration.nix (renamed from infra/nixos/configuration.nix)0
-rw-r--r--ops/infra/nixos/default.nix (renamed from infra/nixos/default.nix)0
-rw-r--r--ops/infra/nixos/desktop.nix (renamed from infra/nixos/desktop.nix)0
-rw-r--r--ops/infra/nixos/dotfiles.nix (renamed from infra/nixos/dotfiles.nix)0
-rw-r--r--ops/infra/nixos/dotfiles/alacritty.yml (renamed from infra/nixos/dotfiles/alacritty.yml)0
-rw-r--r--ops/infra/nixos/dotfiles/config.fish (renamed from infra/nixos/dotfiles/config.fish)0
-rw-r--r--ops/infra/nixos/dotfiles/msmtprc (renamed from infra/nixos/dotfiles/msmtprc)0
-rw-r--r--ops/infra/nixos/dotfiles/notmuch-config (renamed from infra/nixos/dotfiles/notmuch-config)0
-rw-r--r--ops/infra/nixos/dotfiles/offlineimaprc (renamed from infra/nixos/dotfiles/offlineimaprc)0
-rw-r--r--ops/infra/nixos/dotfiles/tmux.conf (renamed from infra/nixos/dotfiles/tmux.conf)0
-rw-r--r--ops/infra/nixos/home.nix (renamed from infra/nixos/home.nix)0
-rw-r--r--ops/infra/nixos/mail.nix (renamed from infra/nixos/mail.nix)0
-rw-r--r--ops/infra/nixos/packages.nix (renamed from infra/nixos/packages.nix)0
-rw-r--r--ops/infra/nixos/stallo-configuration.nix (renamed from infra/nixos/stallo-configuration.nix)0
-rw-r--r--ops/journaldriver/.gitignore (renamed from tools/journaldriver/.gitignore)0
-rw-r--r--ops/journaldriver/Cargo.lock (renamed from tools/journaldriver/Cargo.lock)0
-rw-r--r--ops/journaldriver/Cargo.toml (renamed from tools/journaldriver/Cargo.toml)0
-rw-r--r--ops/journaldriver/README.md (renamed from tools/journaldriver/README.md)0
-rw-r--r--ops/journaldriver/build.rs (renamed from tools/journaldriver/build.rs)0
-rw-r--r--ops/journaldriver/default.nix (renamed from tools/journaldriver/default.nix)0
-rw-r--r--ops/journaldriver/src/main.rs (renamed from tools/journaldriver/src/main.rs)0
-rw-r--r--ops/journaldriver/src/tests.rs (renamed from tools/journaldriver/src/tests.rs)0
-rw-r--r--ops/kms_pass.nix (renamed from tools/kms_pass.nix)0
-rw-r--r--ops/secrets/gcsr-tazjin-password (renamed from secrets/gcsr-tazjin-password)bin186 -> 186 bytes
-rw-r--r--ops/secrets/nixery-gcs-json (renamed from secrets/nixery-gcs-json)bin2416 -> 2416 bytes
-rw-r--r--ops/secrets/nixery-gcs-pem (renamed from secrets/nixery-gcs-pem)bin3214 -> 3214 bytes
-rw-r--r--ops/secrets/nixery-ssh-private (renamed from secrets/nixery-ssh-private)bin1906 -> 1906 bytes
-rw-r--r--ops/sync-gcsr/default.nix (renamed from services/sync-gcsr/default.nix)0
-rw-r--r--ops/sync-gcsr/main.go (renamed from services/sync-gcsr/main.go)0
-rw-r--r--services/nixcon-demo/Cargo.lock905
-rw-r--r--services/nixcon-demo/Cargo.toml8
-rw-r--r--services/nixcon-demo/default.nix2
-rw-r--r--services/nixcon-demo/src/main.rs19
-rw-r--r--tools/gotest/default.nix27
-rw-r--r--tools/gotest/lib.go11
-rw-r--r--tools/gotest/main.go16
-rw-r--r--tools/gotest/test.proto9
-rw-r--r--web/cgit-taz/cgit_depot_url.patch (renamed from services/cgit-taz/cgit_depot_url.patch)0
-rw-r--r--web/cgit-taz/cgit_idx.patch (renamed from services/cgit-taz/cgit_idx.patch)0
-rw-r--r--web/cgit-taz/default.nix (renamed from services/cgit-taz/default.nix)0
-rw-r--r--web/tazblog/blog/Main.hs (renamed from services/tazblog/blog/Main.hs)0
-rw-r--r--web/tazblog/default.nix (renamed from services/tazblog/default.nix)0
-rw-r--r--web/tazblog/shell.nix (renamed from services/tazblog/shell.nix)0
-rw-r--r--web/tazblog/src/Blog.hs (renamed from services/tazblog/src/Blog.hs)0
-rw-r--r--web/tazblog/src/BlogStore.hs (renamed from services/tazblog/src/BlogStore.hs)0
-rw-r--r--web/tazblog/src/RSS.hs (renamed from services/tazblog/src/RSS.hs)0
-rw-r--r--web/tazblog/src/Server.hs (renamed from services/tazblog/src/Server.hs)0
-rw-r--r--web/tazblog/static/apple-touch-icon.png (renamed from services/tazblog/static/apple-touch-icon.png)bin9756 -> 9756 bytes
-rw-r--r--web/tazblog/static/blog.css (renamed from services/tazblog/static/blog.css)0
-rw-r--r--web/tazblog/static/favicon.ico (renamed from services/tazblog/static/favicon.ico)bin4354 -> 4354 bytes
-rw-r--r--web/tazblog/static/keybase.txt (renamed from services/tazblog/static/keybase.txt)0
-rw-r--r--web/tazblog/tazblog.cabal (renamed from services/tazblog/tazblog.cabal)0
-rw-r--r--web/tazblog/tazblog.nix (renamed from services/tazblog/tazblog.nix)0
110 files changed, 1 insertions, 998 deletions
diff --git a/tools/bin/__dispatch.sh b/bin/__dispatch.sh
index 473342769d..f12d6ed368 100755
--- a/tools/bin/__dispatch.sh
+++ b/bin/__dispatch.sh
@@ -27,7 +27,7 @@ case "${TARGET_TOOL}" in
     TARGET_TOOL="pass"
     ;;
   aoc2019)
-    attr="tools.aoc2019.${1}"
+    attr="fun.aoc2019.${1}"
     ;;
   rink)
     attr="third_party.rink"
diff --git a/tools/bin/aoc2019 b/bin/aoc2019
index 8390ec9c96..8390ec9c96 120000
--- a/tools/bin/aoc2019
+++ b/bin/aoc2019
diff --git a/tools/bin/blog_cli b/bin/blog_cli
index 8390ec9c96..8390ec9c96 120000
--- a/tools/bin/blog_cli
+++ b/bin/blog_cli
diff --git a/tools/bin/kms_pass b/bin/kms_pass
index 8390ec9c96..8390ec9c96 120000
--- a/tools/bin/kms_pass
+++ b/bin/kms_pass
diff --git a/tools/bin/kontemplate b/bin/kontemplate
index 8390ec9c96..8390ec9c96 120000
--- a/tools/bin/kontemplate
+++ b/bin/kontemplate
diff --git a/tools/bin/rink b/bin/rink
index 8390ec9c96..8390ec9c96 120000
--- a/tools/bin/rink
+++ b/bin/rink
diff --git a/tools/bin/stern b/bin/stern
index 8390ec9c96..8390ec9c96 120000
--- a/tools/bin/stern
+++ b/bin/stern
diff --git a/tools/bin/terraform b/bin/terraform
index 8390ec9c96..8390ec9c96 120000
--- a/tools/bin/terraform
+++ b/bin/terraform
diff --git a/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md
index 0e46bbedb0..0e46bbedb0 100644
--- a/CODE_OF_CONDUCT.md
+++ b/docs/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 8037e1bf7f..8037e1bf7f 100644
--- a/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
diff --git a/tools/aoc2019/default.nix b/fun/aoc2019/default.nix
index a53586eea9..a53586eea9 100644
--- a/tools/aoc2019/default.nix
+++ b/fun/aoc2019/default.nix
diff --git a/tools/aoc2019/solution-day1.el b/fun/aoc2019/solution-day1.el
index d805c22ec8..d805c22ec8 100644
--- a/tools/aoc2019/solution-day1.el
+++ b/fun/aoc2019/solution-day1.el
diff --git a/tools/aoc2019/solution-day2.el b/fun/aoc2019/solution-day2.el
index 6ecac1e201..6ecac1e201 100644
--- a/tools/aoc2019/solution-day2.el
+++ b/fun/aoc2019/solution-day2.el
diff --git a/tools/aoc2019/solution-day3.el b/fun/aoc2019/solution-day3.el
index b7dfdd245f..b7dfdd245f 100644
--- a/tools/aoc2019/solution-day3.el
+++ b/fun/aoc2019/solution-day3.el
diff --git a/tools/aoc2019/solution-day4.el b/fun/aoc2019/solution-day4.el
index 2805f3f4e9..2805f3f4e9 100644
--- a/tools/aoc2019/solution-day4.el
+++ b/fun/aoc2019/solution-day4.el
diff --git a/services/gemma/CODE_OF_CONDUCT.md b/fun/gemma/CODE_OF_CONDUCT.md
index c4013ac13e..c4013ac13e 100644
--- a/services/gemma/CODE_OF_CONDUCT.md
+++ b/fun/gemma/CODE_OF_CONDUCT.md
diff --git a/services/gemma/LICENSE b/fun/gemma/LICENSE
index 94a9ed024d..94a9ed024d 100644
--- a/services/gemma/LICENSE
+++ b/fun/gemma/LICENSE
diff --git a/services/gemma/README.markdown b/fun/gemma/README.markdown
index 064742c009..064742c009 100644
--- a/services/gemma/README.markdown
+++ b/fun/gemma/README.markdown
diff --git a/services/gemma/build.lisp b/fun/gemma/build.lisp
index e935ce25fd..e935ce25fd 100644
--- a/services/gemma/build.lisp
+++ b/fun/gemma/build.lisp
diff --git a/services/gemma/config.lisp b/fun/gemma/config.lisp
index 54f8e5f344..54f8e5f344 100644
--- a/services/gemma/config.lisp
+++ b/fun/gemma/config.lisp
diff --git a/services/gemma/default.nix b/fun/gemma/default.nix
index f48af48921..f48af48921 100644
--- a/services/gemma/default.nix
+++ b/fun/gemma/default.nix
diff --git a/services/gemma/frontend/Main.elm b/fun/gemma/frontend/Main.elm
index e449908e49..e449908e49 100644
--- a/services/gemma/frontend/Main.elm
+++ b/fun/gemma/frontend/Main.elm
diff --git a/services/gemma/frontend/elm-package.json b/fun/gemma/frontend/elm-package.json
index 2ae541ae0b..2ae541ae0b 100644
--- a/services/gemma/frontend/elm-package.json
+++ b/fun/gemma/frontend/elm-package.json
diff --git a/services/gemma/gemma.asd b/fun/gemma/gemma.asd
index 0aea9c95ff..0aea9c95ff 100644
--- a/services/gemma/gemma.asd
+++ b/fun/gemma/gemma.asd
diff --git a/services/gemma/src/gemma.lisp b/fun/gemma/src/gemma.lisp
index b8a20addd9..b8a20addd9 100644
--- a/services/gemma/src/gemma.lisp
+++ b/fun/gemma/src/gemma.lisp
diff --git a/overrides/buildGo/.skip-subtree b/nix/buildGo/.skip-subtree
index 8db1f814f6..8db1f814f6 100644
--- a/overrides/buildGo/.skip-subtree
+++ b/nix/buildGo/.skip-subtree
diff --git a/overrides/buildGo/README.md b/nix/buildGo/README.md
index e84ede663b..e84ede663b 100644
--- a/overrides/buildGo/README.md
+++ b/nix/buildGo/README.md
diff --git a/overrides/buildGo/default.nix b/nix/buildGo/default.nix
index 140cbf2d9d..140cbf2d9d 100644
--- a/overrides/buildGo/default.nix
+++ b/nix/buildGo/default.nix
diff --git a/overrides/buildGo/example/default.nix b/nix/buildGo/example/default.nix
index 5abed1fbbc..5abed1fbbc 100644
--- a/overrides/buildGo/example/default.nix
+++ b/nix/buildGo/example/default.nix
diff --git a/overrides/buildGo/example/lib.go b/nix/buildGo/example/lib.go
index 8a61370e99..8a61370e99 100644
--- a/overrides/buildGo/example/lib.go
+++ b/nix/buildGo/example/lib.go
diff --git a/overrides/buildGo/example/main.go b/nix/buildGo/example/main.go
index bbcedbff87..bbcedbff87 100644
--- a/overrides/buildGo/example/main.go
+++ b/nix/buildGo/example/main.go
diff --git a/overrides/buildGo/example/thing.proto b/nix/buildGo/example/thing.proto
index 0cb34124df..0cb34124df 100644
--- a/overrides/buildGo/example/thing.proto
+++ b/nix/buildGo/example/thing.proto
diff --git a/overrides/buildGo/external/default.nix b/nix/buildGo/external/default.nix
index 48f678688e..48f678688e 100644
--- a/overrides/buildGo/external/default.nix
+++ b/nix/buildGo/external/default.nix
diff --git a/overrides/buildGo/external/main.go b/nix/buildGo/external/main.go
index aa4a813d32..aa4a813d32 100644
--- a/overrides/buildGo/external/main.go
+++ b/nix/buildGo/external/main.go
diff --git a/overrides/buildGo/proto.nix b/nix/buildGo/proto.nix
index 2ece948ebd..2ece948ebd 100644
--- a/overrides/buildGo/proto.nix
+++ b/nix/buildGo/proto.nix
diff --git a/infra/dns/import b/ops/infra/dns/import
index e79e426b55..e79e426b55 100755
--- a/infra/dns/import
+++ b/ops/infra/dns/import
diff --git a/infra/dns/kontemplate-works b/ops/infra/dns/kontemplate-works
index 326a129d21..326a129d21 100644
--- a/infra/dns/kontemplate-works
+++ b/ops/infra/dns/kontemplate-works
diff --git a/infra/dns/oslo-pub b/ops/infra/dns/oslo-pub
index 674687484b..674687484b 100644
--- a/infra/dns/oslo-pub
+++ b/ops/infra/dns/oslo-pub
diff --git a/infra/dns/root-tazj-in b/ops/infra/dns/root-tazj-in
index 43db5834a0..43db5834a0 100644
--- a/infra/dns/root-tazj-in
+++ b/ops/infra/dns/root-tazj-in
diff --git a/infra/gcp/.gitignore b/ops/infra/gcp/.gitignore
index 96c7538dda..96c7538dda 100644
--- a/infra/gcp/.gitignore
+++ b/ops/infra/gcp/.gitignore
diff --git a/infra/gcp/default.tf b/ops/infra/gcp/default.tf
index 2cb57836fa..2cb57836fa 100644
--- a/infra/gcp/default.tf
+++ b/ops/infra/gcp/default.tf
diff --git a/infra/kubernetes/cgit/config.yaml b/ops/infra/kubernetes/cgit/config.yaml
index 78de82ee09..78de82ee09 100644
--- a/infra/kubernetes/cgit/config.yaml
+++ b/ops/infra/kubernetes/cgit/config.yaml
diff --git a/infra/kubernetes/gemma/config.lisp b/ops/infra/kubernetes/gemma/config.lisp
index 517a658cf1..517a658cf1 100644
--- a/infra/kubernetes/gemma/config.lisp
+++ b/ops/infra/kubernetes/gemma/config.lisp
diff --git a/infra/kubernetes/https-cert/cert.yaml b/ops/infra/kubernetes/https-cert/cert.yaml
index c7a85275ae..c7a85275ae 100644
--- a/infra/kubernetes/https-cert/cert.yaml
+++ b/ops/infra/kubernetes/https-cert/cert.yaml
diff --git a/infra/kubernetes/https-lb/ingress.yaml b/ops/infra/kubernetes/https-lb/ingress.yaml
index 069771a421..069771a421 100644
--- a/infra/kubernetes/https-lb/ingress.yaml
+++ b/ops/infra/kubernetes/https-lb/ingress.yaml
diff --git a/infra/kubernetes/nginx/nginx.conf b/ops/infra/kubernetes/nginx/nginx.conf
index 918aa60678..918aa60678 100644
--- a/infra/kubernetes/nginx/nginx.conf
+++ b/ops/infra/kubernetes/nginx/nginx.conf
diff --git a/infra/kubernetes/nginx/nginx.yaml b/ops/infra/kubernetes/nginx/nginx.yaml
index 983b265baf..983b265baf 100644
--- a/infra/kubernetes/nginx/nginx.yaml
+++ b/ops/infra/kubernetes/nginx/nginx.yaml
diff --git a/infra/kubernetes/nixery/config.yaml b/ops/infra/kubernetes/nixery/config.yaml
index 0775e79b58..0775e79b58 100644
--- a/infra/kubernetes/nixery/config.yaml
+++ b/ops/infra/kubernetes/nixery/config.yaml
diff --git a/infra/kubernetes/nixery/id_nixery.pub b/ops/infra/kubernetes/nixery/id_nixery.pub
index dc3fd617d0..dc3fd617d0 100644
--- a/infra/kubernetes/nixery/id_nixery.pub
+++ b/ops/infra/kubernetes/nixery/id_nixery.pub
diff --git a/infra/kubernetes/nixery/known_hosts b/ops/infra/kubernetes/nixery/known_hosts
index 6a2f84b5fb..6a2f84b5fb 100644
--- a/infra/kubernetes/nixery/known_hosts
+++ b/ops/infra/kubernetes/nixery/known_hosts
diff --git a/infra/kubernetes/nixery/secrets.yaml b/ops/infra/kubernetes/nixery/secrets.yaml
index d9a674d2c9..d9a674d2c9 100644
--- a/infra/kubernetes/nixery/secrets.yaml
+++ b/ops/infra/kubernetes/nixery/secrets.yaml
diff --git a/infra/kubernetes/nixery/ssh_config b/ops/infra/kubernetes/nixery/ssh_config
index 78afbb0b03..78afbb0b03 100644
--- a/infra/kubernetes/nixery/ssh_config
+++ b/ops/infra/kubernetes/nixery/ssh_config
diff --git a/infra/kubernetes/primary-cluster.yaml b/ops/infra/kubernetes/primary-cluster.yaml
index 1d5d33e0bb..1d5d33e0bb 100644
--- a/infra/kubernetes/primary-cluster.yaml
+++ b/ops/infra/kubernetes/primary-cluster.yaml
diff --git a/infra/kubernetes/tazblog/config.yaml b/ops/infra/kubernetes/tazblog/config.yaml
index 165a30f683..165a30f683 100644
--- a/infra/kubernetes/tazblog/config.yaml
+++ b/ops/infra/kubernetes/tazblog/config.yaml
diff --git a/infra/nixos/.gitignore b/ops/infra/nixos/.gitignore
index 773fa16670..773fa16670 100644
--- a/infra/nixos/.gitignore
+++ b/ops/infra/nixos/.gitignore
diff --git a/infra/nixos/README.md b/ops/infra/nixos/README.md
index 4f2e870f90..4f2e870f90 100644
--- a/infra/nixos/README.md
+++ b/ops/infra/nixos/README.md
diff --git a/infra/nixos/adho-configuration.nix b/ops/infra/nixos/adho-configuration.nix
index 11c5a97df5..11c5a97df5 100644
--- a/infra/nixos/adho-configuration.nix
+++ b/ops/infra/nixos/adho-configuration.nix
diff --git a/infra/nixos/configuration.nix b/ops/infra/nixos/configuration.nix
index 57f5c56dc7..57f5c56dc7 100644
--- a/infra/nixos/configuration.nix
+++ b/ops/infra/nixos/configuration.nix
diff --git a/infra/nixos/default.nix b/ops/infra/nixos/default.nix
index 42594f6f58..42594f6f58 100644
--- a/infra/nixos/default.nix
+++ b/ops/infra/nixos/default.nix
diff --git a/infra/nixos/desktop.nix b/ops/infra/nixos/desktop.nix
index 07a6274a56..07a6274a56 100644
--- a/infra/nixos/desktop.nix
+++ b/ops/infra/nixos/desktop.nix
diff --git a/infra/nixos/dotfiles.nix b/ops/infra/nixos/dotfiles.nix
index 2e952207d4..2e952207d4 100644
--- a/infra/nixos/dotfiles.nix
+++ b/ops/infra/nixos/dotfiles.nix
diff --git a/infra/nixos/dotfiles/alacritty.yml b/ops/infra/nixos/dotfiles/alacritty.yml
index d229fbdde6..d229fbdde6 100644
--- a/infra/nixos/dotfiles/alacritty.yml
+++ b/ops/infra/nixos/dotfiles/alacritty.yml
diff --git a/infra/nixos/dotfiles/config.fish b/ops/infra/nixos/dotfiles/config.fish
index de2c99ae60..de2c99ae60 100644
--- a/infra/nixos/dotfiles/config.fish
+++ b/ops/infra/nixos/dotfiles/config.fish
diff --git a/infra/nixos/dotfiles/msmtprc b/ops/infra/nixos/dotfiles/msmtprc
index 624b6a77fc..624b6a77fc 100644
--- a/infra/nixos/dotfiles/msmtprc
+++ b/ops/infra/nixos/dotfiles/msmtprc
diff --git a/infra/nixos/dotfiles/notmuch-config b/ops/infra/nixos/dotfiles/notmuch-config
index a490774e63..a490774e63 100644
--- a/infra/nixos/dotfiles/notmuch-config
+++ b/ops/infra/nixos/dotfiles/notmuch-config
diff --git a/infra/nixos/dotfiles/offlineimaprc b/ops/infra/nixos/dotfiles/offlineimaprc
index 78315447e4..78315447e4 100644
--- a/infra/nixos/dotfiles/offlineimaprc
+++ b/ops/infra/nixos/dotfiles/offlineimaprc
diff --git a/infra/nixos/dotfiles/tmux.conf b/ops/infra/nixos/dotfiles/tmux.conf
index 6c20ae0370..6c20ae0370 100644
--- a/infra/nixos/dotfiles/tmux.conf
+++ b/ops/infra/nixos/dotfiles/tmux.conf
diff --git a/infra/nixos/home.nix b/ops/infra/nixos/home.nix
index 236091cb01..236091cb01 100644
--- a/infra/nixos/home.nix
+++ b/ops/infra/nixos/home.nix
diff --git a/infra/nixos/mail.nix b/ops/infra/nixos/mail.nix
index ba4ebfa060..ba4ebfa060 100644
--- a/infra/nixos/mail.nix
+++ b/ops/infra/nixos/mail.nix
diff --git a/infra/nixos/packages.nix b/ops/infra/nixos/packages.nix
index b90a4a9ee8..b90a4a9ee8 100644
--- a/infra/nixos/packages.nix
+++ b/ops/infra/nixos/packages.nix
diff --git a/infra/nixos/stallo-configuration.nix b/ops/infra/nixos/stallo-configuration.nix
index 4af4a5fd4c..4af4a5fd4c 100644
--- a/infra/nixos/stallo-configuration.nix
+++ b/ops/infra/nixos/stallo-configuration.nix
diff --git a/tools/journaldriver/.gitignore b/ops/journaldriver/.gitignore
index 29e65519ba..29e65519ba 100644
--- a/tools/journaldriver/.gitignore
+++ b/ops/journaldriver/.gitignore
diff --git a/tools/journaldriver/Cargo.lock b/ops/journaldriver/Cargo.lock
index 40bdc96280..40bdc96280 100644
--- a/tools/journaldriver/Cargo.lock
+++ b/ops/journaldriver/Cargo.lock
diff --git a/tools/journaldriver/Cargo.toml b/ops/journaldriver/Cargo.toml
index 248b22807f..248b22807f 100644
--- a/tools/journaldriver/Cargo.toml
+++ b/ops/journaldriver/Cargo.toml
diff --git a/tools/journaldriver/README.md b/ops/journaldriver/README.md
index 4dc9de0f61..4dc9de0f61 100644
--- a/tools/journaldriver/README.md
+++ b/ops/journaldriver/README.md
diff --git a/tools/journaldriver/build.rs b/ops/journaldriver/build.rs
index d64c82a88a..d64c82a88a 100644
--- a/tools/journaldriver/build.rs
+++ b/ops/journaldriver/build.rs
diff --git a/tools/journaldriver/default.nix b/ops/journaldriver/default.nix
index 2df5e58fc8..2df5e58fc8 100644
--- a/tools/journaldriver/default.nix
+++ b/ops/journaldriver/default.nix
diff --git a/tools/journaldriver/src/main.rs b/ops/journaldriver/src/main.rs
index a57bb3505d..a57bb3505d 100644
--- a/tools/journaldriver/src/main.rs
+++ b/ops/journaldriver/src/main.rs
diff --git a/tools/journaldriver/src/tests.rs b/ops/journaldriver/src/tests.rs
index 779add7a70..779add7a70 100644
--- a/tools/journaldriver/src/tests.rs
+++ b/ops/journaldriver/src/tests.rs
diff --git a/tools/kms_pass.nix b/ops/kms_pass.nix
index 14989b392d..14989b392d 100644
--- a/tools/kms_pass.nix
+++ b/ops/kms_pass.nix
diff --git a/secrets/gcsr-tazjin-password b/ops/secrets/gcsr-tazjin-password
index 5893de1315..5893de1315 100644
--- a/secrets/gcsr-tazjin-password
+++ b/ops/secrets/gcsr-tazjin-password
Binary files differdiff --git a/secrets/nixery-gcs-json b/ops/secrets/nixery-gcs-json
index b8b5445116..b8b5445116 100644
--- a/secrets/nixery-gcs-json
+++ b/ops/secrets/nixery-gcs-json
Binary files differdiff --git a/secrets/nixery-gcs-pem b/ops/secrets/nixery-gcs-pem
index 798a1e5a66..798a1e5a66 100644
--- a/secrets/nixery-gcs-pem
+++ b/ops/secrets/nixery-gcs-pem
Binary files differdiff --git a/secrets/nixery-ssh-private b/ops/secrets/nixery-ssh-private
index 5c4ff20233..5c4ff20233 100644
--- a/secrets/nixery-ssh-private
+++ b/ops/secrets/nixery-ssh-private
Binary files differdiff --git a/services/sync-gcsr/default.nix b/ops/sync-gcsr/default.nix
index 114ff221be..114ff221be 100644
--- a/services/sync-gcsr/default.nix
+++ b/ops/sync-gcsr/default.nix
diff --git a/services/sync-gcsr/main.go b/ops/sync-gcsr/main.go
index daec76b346..daec76b346 100644
--- a/services/sync-gcsr/main.go
+++ b/ops/sync-gcsr/main.go
diff --git a/services/nixcon-demo/Cargo.lock b/services/nixcon-demo/Cargo.lock
deleted file mode 100644
index 4339d733b5..0000000000
--- a/services/nixcon-demo/Cargo.lock
+++ /dev/null
@@ -1,905 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "adler32"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "arrayref"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "arrayvec"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "ascii"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "autocfg"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "backtrace"
-version = "0.3.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "backtrace-sys"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "base64"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "base64"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "blake2b_simd"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "brotli-sys"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "brotli2"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "buf_redux"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "byteorder"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cc"
-version = "1.0.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "chrono"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "chunked_transfer"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "constant_time_eq"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "crc32fast"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "deflate"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gzip-header 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "dirs"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "failure"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "failure_derive"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "filetime"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "gzip-header"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "httparse"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "idna"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.65"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "log"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "log"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "memchr"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "mime"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "mime_guess"
-version = "1.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "multipart"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "nixcon-demo"
-version = "0.1.0"
-dependencies = [
- "rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "num-integer"
-version = "0.1.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "phf"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "quote"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "redox_users"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rouille"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rust-argon2"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "ryu"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "safemem"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "serde"
-version = "1.0.101"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "serde_derive"
-version = "1.0.101"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "sha1"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "siphasher"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "smallvec"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "syn"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tempdir"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "term"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "threadpool"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "time"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tiny_http"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "twoway"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicase"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "url"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "version_check"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
-"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
-"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
-"checksum ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14"
-"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
-"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
-"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
-"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "5850aeee1552f495dd0250014cf64b82b7c8879a89d83b33bbdace2cc4f63182"
-"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
-"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
-"checksum buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
-"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
-"checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c"
-"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-"checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68"
-"checksum chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
-"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
-"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-"checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
-"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
-"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
-"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
-"checksum filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd7380b54ced79dda72ecc35cc4fbbd1da6bba54afaa37e96fd1c2a308cd469"
-"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-"checksum gzip-header 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0131feb3d3bb2a5a238d8a4d09f6353b7ebfdc52e77bccbf4ea6eaa751dde639"
-"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
-"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
-"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
-"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
-"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
-"checksum multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28"
-"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
-"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
-"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"
-"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
-"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
-"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
-"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
-"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
-"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
-"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d"
-"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-"checksum rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f"
-"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
-"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
-"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
-"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
-"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd"
-"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e"
-"checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2"
-"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
-"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
-"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
-"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
-"checksum synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203"
-"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
-"checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
-"checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
-"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-"checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
-"checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
-"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
-"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/services/nixcon-demo/Cargo.toml b/services/nixcon-demo/Cargo.toml
deleted file mode 100644
index 06f484021f..0000000000
--- a/services/nixcon-demo/Cargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[package]
-name = "nixcon-demo"
-version = "0.1.0"
-authors = ["Vincent Ambo <tazjin@google.com>"]
-edition = "2018"
-
-[dependencies]
-rouille = "3.0"
diff --git a/services/nixcon-demo/default.nix b/services/nixcon-demo/default.nix
deleted file mode 100644
index 6706f9c268..0000000000
--- a/services/nixcon-demo/default.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-{ pkgs, ... }:
-pkgs.third_party.naersk.buildPackage ./.
diff --git a/services/nixcon-demo/src/main.rs b/services/nixcon-demo/src/main.rs
deleted file mode 100644
index 226fe49ed1..0000000000
--- a/services/nixcon-demo/src/main.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use rouille::Response;
-use std::env;
-use std::io;
-use std::process;
-
-const GREETING: &str = "Haló NixCon!";
-
-fn main() {
-    if let Some(arg) = env::args().last() {
-        if arg == "--cli" {
-            println!("{}", GREETING);
-            process::exit(0);
-        }
-    }
-
-    rouille::start_server("0.0.0.0:8080", move |req| {
-        rouille::log(req, io::stdout(), || Response::text(GREETING))
-    })
-}
diff --git a/tools/gotest/default.nix b/tools/gotest/default.nix
deleted file mode 100644
index 168d15748e..0000000000
--- a/tools/gotest/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file demonstrates how to make use of pkgs.buildGo.
-#
-# It introduces libraries and protobuf support, however gRPC support
-# is not yet included.
-#
-# From the root of this repository this example can be built with
-# `nix-build -A tools.gotest`
-{ pkgs, ... }:
-
-let
-  inherit (pkgs) buildGo;
-
-  somelib = buildGo.package {
-    name = "somelib";
-    srcs = [ ./lib.go ];
-  };
-
-  someproto = buildGo.proto {
-    name = "someproto";
-    proto = ./test.proto;
-  };
-
-in buildGo.program {
-  name = "gotest";
-  srcs = [ ./main.go ];
-  deps = [ somelib someproto ];
-} // { meta.enableCI = true; }
diff --git a/tools/gotest/lib.go b/tools/gotest/lib.go
deleted file mode 100644
index 0aeebb2aea..0000000000
--- a/tools/gotest/lib.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package somelib
-
-import "fmt"
-
-func Name() string {
-	return "edef"
-}
-
-func Greet(s string) string {
-	return fmt.Sprintf("Hello %s", s)
-}
diff --git a/tools/gotest/main.go b/tools/gotest/main.go
deleted file mode 100644
index 99218c0776..0000000000
--- a/tools/gotest/main.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// This program just exists to import some libraries and demonstrate
-// that the build works, it doesn't do anything useful.
-package main
-
-import (
-	"fmt"
-	"somelib"
-	"someproto"
-)
-
-func main() {
-	p := someproto.Person{
-		Name: somelib.Name(),
-	}
-	fmt.Println(somelib.Greet(fmt.Sprintf("%v", p)))
-}
diff --git a/tools/gotest/test.proto b/tools/gotest/test.proto
deleted file mode 100644
index 76af63072b..0000000000
--- a/tools/gotest/test.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-package someproto;
-
-import "google/protobuf/timestamp.proto";
-
-message Person {
-  string name = 1;
-  google.protobuf.Timestamp last_updated = 2;
-}
diff --git a/services/cgit-taz/cgit_depot_url.patch b/web/cgit-taz/cgit_depot_url.patch
index cb81a2a49a..cb81a2a49a 100644
--- a/services/cgit-taz/cgit_depot_url.patch
+++ b/web/cgit-taz/cgit_depot_url.patch
diff --git a/services/cgit-taz/cgit_idx.patch b/web/cgit-taz/cgit_idx.patch
index 67dbc0c7ab..67dbc0c7ab 100644
--- a/services/cgit-taz/cgit_idx.patch
+++ b/web/cgit-taz/cgit_idx.patch
diff --git a/services/cgit-taz/default.nix b/web/cgit-taz/default.nix
index 4559eb4dbf..4559eb4dbf 100644
--- a/services/cgit-taz/default.nix
+++ b/web/cgit-taz/default.nix
diff --git a/services/tazblog/blog/Main.hs b/web/tazblog/blog/Main.hs
index 6074f96b76..6074f96b76 100644
--- a/services/tazblog/blog/Main.hs
+++ b/web/tazblog/blog/Main.hs
diff --git a/services/tazblog/default.nix b/web/tazblog/default.nix
index eecadff6ba..eecadff6ba 100644
--- a/services/tazblog/default.nix
+++ b/web/tazblog/default.nix
diff --git a/services/tazblog/shell.nix b/web/tazblog/shell.nix
index ebb891a874..ebb891a874 100644
--- a/services/tazblog/shell.nix
+++ b/web/tazblog/shell.nix
diff --git a/services/tazblog/src/Blog.hs b/web/tazblog/src/Blog.hs
index 0a53b5f2fb..0a53b5f2fb 100644
--- a/services/tazblog/src/Blog.hs
+++ b/web/tazblog/src/Blog.hs
diff --git a/services/tazblog/src/BlogStore.hs b/web/tazblog/src/BlogStore.hs
index 60ccd0b5a0..60ccd0b5a0 100644
--- a/services/tazblog/src/BlogStore.hs
+++ b/web/tazblog/src/BlogStore.hs
diff --git a/services/tazblog/src/RSS.hs b/web/tazblog/src/RSS.hs
index 913aa9a408..913aa9a408 100644
--- a/services/tazblog/src/RSS.hs
+++ b/web/tazblog/src/RSS.hs
diff --git a/services/tazblog/src/Server.hs b/web/tazblog/src/Server.hs
index 4012998839..4012998839 100644
--- a/services/tazblog/src/Server.hs
+++ b/web/tazblog/src/Server.hs
diff --git a/services/tazblog/static/apple-touch-icon.png b/web/tazblog/static/apple-touch-icon.png
index 22ba058cdd..22ba058cdd 100644
--- a/services/tazblog/static/apple-touch-icon.png
+++ b/web/tazblog/static/apple-touch-icon.png
Binary files differdiff --git a/services/tazblog/static/blog.css b/web/tazblog/static/blog.css
index e6e4ae3c2b..e6e4ae3c2b 100644
--- a/services/tazblog/static/blog.css
+++ b/web/tazblog/static/blog.css
diff --git a/services/tazblog/static/favicon.ico b/web/tazblog/static/favicon.ico
index 2958dd3afc..2958dd3afc 100644
--- a/services/tazblog/static/favicon.ico
+++ b/web/tazblog/static/favicon.ico
Binary files differdiff --git a/services/tazblog/static/keybase.txt b/web/tazblog/static/keybase.txt
index 661c33e01e..661c33e01e 100644
--- a/services/tazblog/static/keybase.txt
+++ b/web/tazblog/static/keybase.txt
diff --git a/services/tazblog/tazblog.cabal b/web/tazblog/tazblog.cabal
index 58aeb7049e..58aeb7049e 100644
--- a/services/tazblog/tazblog.cabal
+++ b/web/tazblog/tazblog.cabal
diff --git a/services/tazblog/tazblog.nix b/web/tazblog/tazblog.nix
index b59cddec07..b59cddec07 100644
--- a/services/tazblog/tazblog.nix
+++ b/web/tazblog/tazblog.nix