From d284712b57f91c6df4833fb945307cd1ed07e457 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sun, 5 Sep 2021 15:08:40 +0200 Subject: [PATCH] now it works --- Rakefile | 8 +- content/nixos/tinc.md | 16 ++-- layouts/_default/baseof.html | 5 +- .../nixos/tinc => src/images}/2subnets.nwdiag | 0 src/images/2subnets.png | Bin 0 -> 9009 bytes src/images/2subnets.svg | 69 ++++++++++++++++++ .../tinc => src/images}/3computers.nwdiag | 0 src/images/3computers.png | Bin 0 -> 7906 bytes src/images/3computers.svg | 55 ++++++++++++++ src/lessc/page/main.less | 1 + 10 files changed, 143 insertions(+), 11 deletions(-) rename {static/nixos/tinc => src/images}/2subnets.nwdiag (100%) create mode 100644 src/images/2subnets.png create mode 100644 src/images/2subnets.svg rename {static/nixos/tinc => src/images}/3computers.nwdiag (100%) create mode 100644 src/images/3computers.png create mode 100644 src/images/3computers.svg diff --git a/Rakefile b/Rakefile index 905bde9..5f82c1e 100644 --- a/Rakefile +++ b/Rakefile @@ -42,7 +42,7 @@ end # # tasks for blockdiag files # -Dir['static/**/*.diag'].each do |diag_file| +Dir['src/images/**/*.diag'].each do |diag_file| name = diag_file[0..-6] svg_file = "#{name}.svg" @@ -64,7 +64,7 @@ end # # tasks for nwdiag files # -Dir['static/**/*.nwdiag'].each do |diag_file| +Dir['src/images/**/*.nwdiag'].each do |diag_file| name = diag_file[0..-8] svg_file = "#{name}.svg" @@ -86,7 +86,7 @@ end # # tasks for seqdiag files # -Dir['static/**/*.seqdiag'].each do |diag_file| +Dir['src/images/**/*.seqdiag'].each do |diag_file| name = diag_file[0..-9] svg_file = "#{name}.svg" @@ -108,7 +108,7 @@ end # # tasks for actdiag files # -Dir['static/**/*.actdiag'].each do |diag_file| +Dir['src/images/**/*.actdiag'].each do |diag_file| name = diag_file[0..-9] svg_file = "#{name}.svg" diff --git a/content/nixos/tinc.md b/content/nixos/tinc.md index 2fcccac..d1ca79a 100644 --- a/content/nixos/tinc.md +++ b/content/nixos/tinc.md @@ -35,10 +35,10 @@ and micromanage in the computer specific definitions. ## How to import You can use `fetchgit` to import it without downloading it yourself. - -{{% note %}} -To find the newest `rev` and `sha256` just call `nix-shell -p nix-prefetch-git --run "nix-prefetch-git https://github.com/mrVanDalo/nixos-tinc.git"` -{{% /note %}} +To find the newest `rev` and `sha256` just call +```shell +nix-shell -p nix-prefetch-git --run "nix-prefetch-git https://github.com/mrVanDalo/nixos-tinc.git" +``` ``` {pkgs, ... }: @@ -107,7 +107,9 @@ it will be the computer that connects all the other computer. You can have multiple computers which are reachable from the internet but for this example we only have one. -{{
}} +{{< card >}} +{{
}} +{{< /card >}} Here is the `configuration.nix`. First we define the whole topology in `default` and @@ -234,7 +236,9 @@ This is a very common problem in [Kubernetes](https://kubernetes.io/). It can be resolved by using the `tincSubnet` parameter, to configure sub-network routing. -{{
}} +{{< card >}} +{{
}} +{{< /card >}} Achieving this is very simple, just add the `tincSubnet` parameter in the `hosts` attribute and your done. diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 378f740..4e219b8 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,7 +1,10 @@ - + {{ .Title }} + {{/* needed for responsive design */}} + + diff --git a/static/nixos/tinc/2subnets.nwdiag b/src/images/2subnets.nwdiag similarity index 100% rename from static/nixos/tinc/2subnets.nwdiag rename to src/images/2subnets.nwdiag diff --git a/src/images/2subnets.png b/src/images/2subnets.png new file mode 100644 index 0000000000000000000000000000000000000000..6e77130b544c05e52d00fe20acd8a97e71929c14 GIT binary patch literal 9009 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 + + + + + + + + blockdiag + +nwdiag { + + internet [shape = cloud]; + + internet -- Gibson [address = "my.awesome.dns.com"] + + network private { + address = "10.1.1.0/24"; + + Gibson [address = "10.1.1.1"]; + Hackbardt [address = "10.1.1.2"]; + HAL [address = "10.1.1.3"]; + } + + network "private (subnet)" { + Hackbardt [address = "10.2.2.0/24"]; + HAL [address = "10.2.3.0/24"]; + } + +} + + + + + + + + + + + + + + private + 10.1.1.0/24 + "private (subnet)" + + + + internet + + my.awesome.dns.com + + 10.1.1.1 + + Gibson + + 10.1.1.2 + + 10.2.2.0/24 + + Hackbardt + + 10.1.1.3 + + 10.2.3.0/24 + + HAL + diff --git a/static/nixos/tinc/3computers.nwdiag b/src/images/3computers.nwdiag similarity index 100% rename from static/nixos/tinc/3computers.nwdiag rename to src/images/3computers.nwdiag diff --git a/src/images/3computers.png b/src/images/3computers.png new file mode 100644 index 0000000000000000000000000000000000000000..4becf9922a6173ba94304828dadc27a9d3f95a92 GIT binary patch literal 7906 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 literal 0 HcmV?d00001 diff --git a/src/images/3computers.svg b/src/images/3computers.svg new file mode 100644 index 0000000..528decd --- /dev/null +++ b/src/images/3computers.svg @@ -0,0 +1,55 @@ + + + + + + + + + blockdiag + +nwdiag { + + internet [shape = cloud]; + + internet -- Gibson [address = "my.awesome.dns.com"] + + network private { + address = "10.1.1.0/24"; + + Gibson [address = "10.1.1.1"]; + Hackbardt [address = "10.1.1.2"]; + HAL [address = "10.1.1.3"]; + } + +} + + + + + + + + + + private + 10.1.1.0/24 + + + + internet + + my.awesome.dns.com + + 10.1.1.1 + + Gibson + + 10.1.1.2 + + Hackbardt + + 10.1.1.3 + + HAL + diff --git a/src/lessc/page/main.less b/src/lessc/page/main.less index 6092114..e879eb5 100644 --- a/src/lessc/page/main.less +++ b/src/lessc/page/main.less @@ -94,6 +94,7 @@ table.comparison { } figure { + widows: 98%; margin-top: 1em; margin-bottom: 1em; margin-left: 0;