From 8c80c3fc31d3bdae7aa4e9c2dbcfe38ccc71725b Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 12 Sep 2016 10:42:02 +0200
Subject: [PATCH] use/install separate wiki pages for sysadmin.adoc includes

---
 Makefile                                      | 24 ++++++++++++-------
 .../pve-docs-mediawiki-import                 | 24 +++++++++++++++++++
 sysadmin.adoc                                 | 23 ++++++++++++++++++
 3 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 4905eb5..f956ddc 100644
--- a/Makefile
+++ b/Makefile
@@ -98,12 +98,16 @@ GEN_SCRIPTS=					\
 	gen-pve-firewall-rules-opts.pl		\
 	gen-pve-firewall-vm-opts.pl
 
+SYSADMIN_PARTS=					\
+	getting-help				\
+	pve-network				\
+	pve-package-repos			\
+	pve-installation			\
+	system-software-updates			\
+	local-zfs
+
 SYSADMIN_SOURCES=				\
-	getting-help.adoc			\
-	pve-package-repos.adoc			\
-	pve-installation.adoc			\
-	system-software-updates.adoc		\
-	local-zfs.adoc				\
+	$(addsuffix .adoc, ${SYSADMIN_PARTS})	\
 	sysadmin.adoc
 
 API_VIEWER_SOURCES=				\
@@ -145,9 +149,10 @@ PVE_ADMIN_GUIDE_SOURCES=			\
 	GFDL.adoc				\
 	attributes.txt
 
-WIKI_IMPORTS=								\
-	$(addsuffix -plain.html, $(addprefix chapter-, ${CHAPTER_LIST}))\
-	$(addsuffix .5-plain.html, ${CONFIG_LIST})			\
+WIKI_IMPORTS=									\
+	$(addsuffix -plain.html, $(addprefix sysadmin-, ${SYSADMIN_PARTS})) 	\
+	$(addsuffix -plain.html, $(addprefix chapter-, ${CHAPTER_LIST}))	\
+	$(addsuffix .5-plain.html, ${CONFIG_LIST})				\
 	$(addsuffix -plain.html, $(addprefix pve-storage-, ${STORAGE_TYPES}))
 
 INDEX_INCLUDES=								\
@@ -171,6 +176,9 @@ all: index.html
 %-nwdiag.svg: %.nwdiag
 	nwdiag -T svg $*.nwdiag -o $@;
 
+sysadmin-%-plain.html: %.adoc
+	asciidoc -s -a wiki ${ADOC_STDARG} -o $@ $*.adoc
+
 chapter-sysadmin.html chapter-sysadmin-plain.html: ${SYSADMIN_SOURCES}
 
 chapter-%.html: %.adoc ${PVE_COMMON_DOC_SOURCES}
diff --git a/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import b/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import
index cd4e464..d1d98d7 100755
--- a/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import
+++ b/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import
@@ -68,6 +68,30 @@ my $docs = {
 	title => "High Availability",
 	category => $cat_refdoc,
     },
+    'sysadmin-getting-help-plain.html' => {
+	title => "Getting Help",
+	category => $cat_refdoc,
+    },
+    'sysadmin-pve-network-plain.html' => {
+	title => "Network Configuration",
+	category => $cat_refdoc,
+    },
+    'sysadmin-local-zfs-plain.html' => {
+	title => "ZFS on Linux",
+	category => $cat_refdoc,
+    },
+    'sysadmin-pve-installation-plain.html' => {
+	title => "Installation",
+	category => $cat_refdoc,
+    },
+    'sysadmin-pve-package-repos-plain.html' => {
+	title => "Package Repositories",
+	category => $cat_refdoc,
+    },
+    'sysadmin-system-software-updates-plain.html' => {
+	title => "System Software Updates",
+	category => $cat_refdoc,
+    },
     'chapter-sysadmin-plain.html' => {
 	title => "Host System Administration",
 	category => $cat_refdoc,
diff --git a/sysadmin.adoc b/sysadmin.adoc
index 04712c1..74c6c8c 100644
--- a/sysadmin.adoc
+++ b/sysadmin.adoc
@@ -64,6 +64,27 @@ Recommended system requirements
 
 * At least two NIC´s, depending on the used storage technology you need more
 
+ifdef::wiki[]
+
+See Also
+--------
+
+* link:/wiki/Getting_Help[Getting Help]
+
+* link:/wiki/Package_Repositories[Package Repositories]
+
+* link:/wiki/Installation[Installation]
+
+* link:/wiki/Network_Configuration[Network Configuration] 
+
+* link:/wiki/System_Software_Updates[System Software Updates]
+
+* link:/wiki/ZFS_on_Linux[ZFS on Linux]
+
+endif::wiki[]
+
+
+ifndef::wiki[]
 
 include::getting-help.adoc[]
 
@@ -77,6 +98,8 @@ include::pve-network.adoc[]
 
 include::local-zfs.adoc[]
 
+endif::wiki[]
+
 
 ////
 TODO:
-- 
2.39.2