X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=sysadmin.adoc;h=ccba5c98392d7b4a37dc5a264323b27a18307d76;hb=9e8f2770b0b2e65938a2f543f861e88a57305000;hp=61b33a3063444942960c641cb0f7fa28448ab5e8;hpb=2ce0ca781f16c36308c434d42091bd453615bef7;p=pve-docs.git

diff --git a/sysadmin.adoc b/sysadmin.adoc
index 61b33a3..ccba5c9 100644
--- a/sysadmin.adoc
+++ b/sysadmin.adoc
@@ -6,7 +6,7 @@ include::attributes.txt[]
 distribution. That means that you have access to the whole world of
 Debian packages, and the base system is well documented. The
 https://debian-handbook.info/download/stable/debian-handbook.pdf[Debian
-Administrator\'s Handbook] is available online, and provide a
+Administrator\'s Handbook] is available online, and provides a
 comprehensive introduction to the Debian operating system (see
 xref:Hertzog13[]).
 
@@ -27,74 +27,42 @@ topics. They either explains things which are different on {pve}, or
 tasks which are commonly used on {pve}. For other topics, please refer
 to the standard Debian documentation.
 
-System requirements
--------------------
 
-For production servers, high quality server equipment is needed. Keep
-in mind, if you run 10 Virtual Servers on one machine and you then
-experience a hardware failure, 10 services are lost. {pve}
-supports clustering, this means that multiple {pve} installations
-can be centrally managed thanks to the included cluster functionality.
+ifdef::wiki[]
 
-{pve} can use local storage (DAS), SAN, NAS and also distributed
-storage (Ceph RBD). For details see xref:chapter-storage[chapter storage].
+See Also
+--------
 
-Minimum requirements, for evaluation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* link:/wiki/Package_Repositories[Package Repositories]
 
-* CPU: 64bit (Intel EMT64 or AMD64)
+* link:/wiki/Network_Configuration[Network Configuration] 
 
-* RAM: 1 GB RAM
+* link:/wiki/System_Software_Updates[System Software Updates]
 
-* Hard drive
+* link:/wiki/Logical_Volume_Manager_(LVM)[Logical Volume Manager (LVM)]
 
-* One NIC
+* link:/wiki/ZFS_on_Linux[ZFS on Linux]
 
-Recommended system requirements
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+endif::wiki[]
 
-* CPU: 64bit (Intel EMT64 or AMD64), Multi core CPU recommended
 
-* RAM: 8 GB is good, more is better
-
-* Hardware RAID with batteries protected write cache (BBU) or flash
- based protection
-
-* Fast hard drives, best results with 15k rpm SAS, Raid10
-
-* At least two NIC´s, depending on the used storage technology you need more
-
-
-include::getting-help.adoc[]
+ifndef::wiki[]
 
 include::pve-package-repos.adoc[]
 
-include::pve-installation.adoc[]
-
 include::system-software-updates.adoc[]
 
+include::pve-network.adoc[]
 
-Network Configuration
----------------------
-
-Basic network setup.
-
-
+include::local-lvm.adoc[]
 
-Local Storage
--------------
+include::local-zfs.adoc[]
 
-Logical Volume Manager (LVM)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+endif::wiki[]
 
-TODO: info about LVM.
-
-
-ZFS on Linux
-~~~~~~~~~~~~
-
-TODO: info about ZFS.
 
+////
+TODO:
 
 Working with 'systemd'
 ----------------------
@@ -104,9 +72,4 @@ Journal and syslog
 
 TODO: explain persistent journal...
 
-
-
-
-
-
-
+////