use/install separate wiki pages for sysadmin.adoc includes

diff --git a/Makefile b/Makefile
index 4905eb5bd34b7f2f17f2148e90e9c68e927f64eb..f956ddc0dd0a6bb1d3441994f003d1f743dce78d 100644 (file)
--- 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 cd4e4640f133f2aa51ea6e3d276f3834d5a75b6d..d1d98d7446b395ee870c8e987fe3601a81137122 100755 (executable)
--- 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 04712c1a6fa06d5e5f9125792240e65558c9faa7..74c6c8cee9c71f59317f2aa924a8cc18c05e9141 100644 (file)
--- 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: