install and use new network diagrams

diff --git a/Makefile b/Makefile
index 0b1284f753ec9f9c1cb01886030e9a1a5b300c4e..1ca4192d5f1a9a93e3b084b3d6926b9d0743c55a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -202,6 +202,8 @@ $(DOC_DEB): index.html $(WIKI_IMPORTS) $(API_VIEWER_SOURCES) verify-images
        install -dm755 build-$(DOC_PACKAGE)/usr/share/doc/${DOC_PACKAGE}
        install -m 0644 index.html ${INDEX_INCLUDES} build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE}
        install -m 0644 ${WIKI_IMPORTS} build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE}
+       # install images
+       make -C images DESTDIR=../build-$(DOC_PACKAGE) install
        # install screenshot images
        install -dm755 build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE}/images/screenshot
        install -m 0644 images/screenshot/*.png build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE}/images/screenshot

diff --git a/images/Makefile b/images/Makefile
index f6e210e06c591f87e6a784456abaf80e5ad7c391..1f386018d5d39486be2d73fc7082c069ba625539 100644 (file)
--- a/images/Makefile
+++ b/images/Makefile
@@ -1,5 +1,10 @@
 
-all:
+TT_SOURCES=                                    \
+       default-network-setup-bond.tt           \
+       default-network-setup-routed.tt         \
+       default-network-setup-bridge.tt
+
+all: $(TT_SOURCES:.tt=.svg)
 
 %.tmp.dot: %.tt pve_network_templates.tt
        tpage $*.tt >$*.tmp.dot
@@ -7,6 +12,13 @@ all:
 %.svg: %.tmp.dot
        dot $*.tmp.dot -T svg -o $*.svg
 
+update:
+       rm -f $(TT_SOURCES:.tt=.svg)
+       make $(TT_SOURCES:.tt=.svg)
+
+install: $(TT_SOURCES:.tt=.svg)
+       install -d -m 0755 $(DESTDIR)/usr/share/pve-docs/images
+       install -m 0644 $(TT_SOURCES:.tt=.svg) $(DESTDIR)/usr/share/pve-docs/images
 
 clean:
        rm -f *.tmp.dot

diff --git a/pve-network.adoc b/pve-network.adoc
index 198f2d1681b4888a6d4a81bb76a37e6ba6b3aeb9..1ac5b2816f2f282a3236fb24214341b7b8273570 100644 (file)
--- a/pve-network.adoc
+++ b/pve-network.adoc
@@ -102,6 +102,7 @@ virtual networks.
 Default Configuration using a Bridge
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+[thumbnail="default-network-setup-bridge.svg"]
 Bridges are like physical network switches implemented in software.
 All VMs can share a single bridge, or you can create multiple bridges to 
 separate network domains. Each host can have up to 4094 bridges.
@@ -146,6 +147,7 @@ You can avoid the problem by ``routing'' all traffic via a single
 interface. This makes sure that all network packets use the same MAC
 address.
 
+[thumbnail="default-network-setup-routed.svg"]
 A common scenario is that you have a public IP (assume `198.51.100.5`
 for this example), and an additional IP block for your VMs
 (`203.0.113.16/29`). We recommend the following setup for such
@@ -314,6 +316,7 @@ iface vmbr0 inet static
 ----
 
 
+[thumbnail="default-network-setup-bond.svg"]
 Another possibility it to use the bond directly as bridge port.
 This can be used to make the guest network fault-tolerant.