summaryrefslogtreecommitdiffstats
path: root/website
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-06-08 15:39:59 -0400
committerMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-06-08 15:39:59 -0400
commitf93692f7ddd7a18fc0c48c2e42e56e801e7df2e4 (patch)
tree56b1dfcb4904477f574f39a9b40f468792c4b92a /website
parent066b6fd14f91959ff7272d1303ccab273d61ff6a (diff)
downloadthird_party-cobbler-f93692f7ddd7a18fc0c48c2e42e56e801e7df2e4.tar.gz
third_party-cobbler-f93692f7ddd7a18fc0c48c2e42e56e801e7df2e4.tar.xz
third_party-cobbler-f93692f7ddd7a18fc0c48c2e42e56e801e7df2e4.zip
New cobbler website.
Diffstat (limited to 'website')
-rw-r--r--website/new/about.html6
-rwxr-xr-xwebsite/new/cobbler-dhcp.php (renamed from website/new/cobbler-guide.php)4
-rwxr-xr-xwebsite/new/cobbler-import.php44
-rwxr-xr-xwebsite/new/cobbler-manpage.php44
-rwxr-xr-xwebsite/new/cobbler-repos.php44
-rwxr-xr-xwebsite/new/communicate.php2
-rw-r--r--website/new/docs/cobbler-dhcp.html105
-rw-r--r--website/new/docs/cobbler-guide.html6
-rw-r--r--website/new/docs/cobbler-import.html98
-rw-r--r--website/new/docs/cobbler-repos.html94
-rw-r--r--website/new/docs/cobbler.html13
-rw-r--r--website/new/docs/cobbler_summit.odpbin0 -> 615454 bytes
-rw-r--r--website/new/docs/koan.html12
-rw-r--r--website/new/documentation.html22
-rwxr-xr-xwebsite/new/documentation.php2
-rw-r--r--website/new/download.html9
-rwxr-xr-xwebsite/new/download.php2
-rw-r--r--website/new/faq.html16
-rwxr-xr-xwebsite/new/faq.php2
-rw-r--r--website/new/index.html115
-rwxr-xr-xwebsite/new/index.php5
-rwxr-xr-xwebsite/new/koan-manpage.php44
-rwxr-xr-xwebsite/new/news.php2
-rw-r--r--website/push.sh2
24 files changed, 522 insertions, 171 deletions
diff --git a/website/new/about.html b/website/new/about.html
index 648fc47..fce038a 100644
--- a/website/new/about.html
+++ b/website/new/about.html
@@ -8,11 +8,11 @@
<a href="img/screenshot_full.png"><img src="img/screenshot.png" style="float: left; margin-right: 10px;" /></a>
-->
-<p>Cobbler is a Linux provisioning tool that allows for rapid setup of network installation environments. With a simple series of commands, network installs can be configured for PXE, reinstallations, and virtualized installs. Cobbler uses a helper program called 'Koan' for reinstalls and virtualization support.</p>
+<p>Cobbler is a Linux provisioning tool that allows for rapid setup of network installation environments. With a simple series of commands, network installs can be configured for PXE, reinstallations, and virtualized installs. Cobbler uses a helper program called 'Koan' (which interacts with Cobbler) for reinstallation and virtualization support.</p>
-<p>Installation trees can be imported directly from media you already have (or copied from a mirror location), and turned into network install sources within minutes. RHEL, Fedora, and Centos are all supported for both the boot server and installation targets.</p>
+<p>Setting up Cobbler is simple. Installation trees can be <A HREF="./cobbler-import.php">imported</A> directly from media you already have (or copied from a mirror location), and turned into network install sources within minutes. RHEL, Fedora, and Centos are all supported for both the boot server and installation targets.</p>
-<p>Cobbler can, if desired, also assist in managing of DHCP infrastructure for provisioned systems (using <A HREF="http://www.isc.org/sw/dhcp/">ISC dhcp</A> or <A HREF="http://www.thekelleys.org.uk/dnsmasq/doc.html">dnsmasq</A>), mirroring install trees, templating kickstart files, automatically creating PXE menus, and locally mirroring software repositories used by systems on your network.</p>
+<p>Cobbler can, if desired, also assist in <A HREF="./cobbler-dhcp.php">managing of DHCP infrastructure</A> for provisioned systems (using <A HREF="http://www.isc.org/sw/dhcp/">ISC dhcp</A> or <A HREF="http://www.thekelleys.org.uk/dnsmasq/doc.html">dnsmasq</A>), mirroring install trees, templating kickstart files, automatically creating PXE menus, and locally <A HREF="./cobbler-repos.php">mirroring repositories</A> used by systems on your network.</p>
<p>In short, Cobbler helps build and maintain network intallation infrastructure really easily. It's highly customizable to your particular methods of operation through a wide variety of options, a pluggable extension mechanism, and (for developers) it's own Python API. Cobbler lets administrators forget <i>how</i> software gets installed and delivered and lets them concentrate instead on what they want to install where.</p>
diff --git a/website/new/cobbler-guide.php b/website/new/cobbler-dhcp.php
index 99d6456..08f7ea4 100755
--- a/website/new/cobbler-guide.php
+++ b/website/new/cobbler-dhcp.php
@@ -9,7 +9,7 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="description" content="" />
<meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Cobbler</title>
<link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
</head>
@@ -29,7 +29,7 @@
<div id="content">
<?php
- include("docs/ump-install-setup.html");
+ include("docs/cobbler-dhcp.html");
?>
</div>
diff --git a/website/new/cobbler-import.php b/website/new/cobbler-import.php
new file mode 100755
index 0000000..11310fb
--- /dev/null
+++ b/website/new/cobbler-import.php
@@ -0,0 +1,44 @@
+<?php
+ $current_page = 'documentation';
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="description" content="" />
+<meta name="keywords" content="" />
+<title>Cobbler</title>
+
+ <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
+</head>
+
+<body>
+<div id="wrap">
+<?php
+ include("top.html");
+?>
+
+<div id="main">
+ <div id="sidebar">
+<?php
+ include("nav.php");
+?>
+ </div>
+
+<div id="content">
+<?php
+ include("docs/cobbler-import.html");
+?>
+
+</div>
+</div>
+<div id="footer">
+<?php
+ include("footer.html");
+?>
+</div>
+</div>
+</body>
+</html>
diff --git a/website/new/cobbler-manpage.php b/website/new/cobbler-manpage.php
new file mode 100755
index 0000000..ebbc56c
--- /dev/null
+++ b/website/new/cobbler-manpage.php
@@ -0,0 +1,44 @@
+<?php
+ $current_page = 'documentation';
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="description" content="" />
+<meta name="keywords" content="" />
+<title>Cobbler</title>
+
+ <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
+</head>
+
+<body>
+<div id="wrap">
+<?php
+ include("top.html");
+?>
+
+<div id="main">
+ <div id="sidebar">
+<?php
+ include("nav.php");
+?>
+ </div>
+
+<div id="content">
+<?php
+ include("docs/cobbler.html");
+?>
+
+</div>
+</div>
+<div id="footer">
+<?php
+ include("footer.html");
+?>
+</div>
+</div>
+</body>
+</html>
diff --git a/website/new/cobbler-repos.php b/website/new/cobbler-repos.php
new file mode 100755
index 0000000..a5a81db
--- /dev/null
+++ b/website/new/cobbler-repos.php
@@ -0,0 +1,44 @@
+<?php
+ $current_page = 'documentation';
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="description" content="" />
+<meta name="keywords" content="" />
+<title>Cobbler</title>
+
+ <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
+</head>
+
+<body>
+<div id="wrap">
+<?php
+ include("top.html");
+?>
+
+<div id="main">
+ <div id="sidebar">
+<?php
+ include("nav.php");
+?>
+ </div>
+
+<div id="content">
+<?php
+ include("docs/cobbler-repos.html");
+?>
+
+</div>
+</div>
+<div id="footer">
+<?php
+ include("footer.html");
+?>
+</div>
+</div>
+</body>
+</html>
diff --git a/website/new/communicate.php b/website/new/communicate.php
index 2c4371f..62c0642 100755
--- a/website/new/communicate.php
+++ b/website/new/communicate.php
@@ -10,7 +10,7 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="description" content="" />
<meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Cobbler</title>
<link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
</head>
diff --git a/website/new/docs/cobbler-dhcp.html b/website/new/docs/cobbler-dhcp.html
new file mode 100644
index 0000000..696538d
--- /dev/null
+++ b/website/new/docs/cobbler-dhcp.html
@@ -0,0 +1,105 @@
+<a name="toc">
+<h2>Cobbler's DHCP Features</h2>
+</a>
+
+<a name="about">
+<h2>About</h2>
+</a>
+<p>
+Cobbler can optionally help configure a DHCP setup, to make sure that specific systems (specified by MAC address) get assigned to specific IP addresses.
+</p>
+
+<a name="whatssupported">
+<h2>What's Supported</h2>
+</a>
+<p>
+Currently cobbler can help generate a ISC DHCP configuration (package name: dhcpd). Cobbler 0.5.0 (release pending) can also use dnsmasq. DNSmasq can help you assign hostnames to specific systems as well as just the IP's.
+</p>
+
+<a name="#when">
+<h2>When To Enable DHCP Management</h2>
+</a>
+<p>
+If you are running on a larger network, most likely DHCP already exists. Cobbler managing DHCP, though, may be very appropriate for labs or other situations where admins can already control their DHCP. For all of this to work, cobbler must be running on the DHCP server.
+</p>
+
+<a name="#do_not_want">
+<h2>What If I Don't Want This?</h2>
+</a>
+<p>
+It's fine to not have Cobbler manage your DHCP infrastructure. In fact, it's the default behavior. If you want PXE to work in this case, just make sure that the next-server entry in your dhcp.conf, as well as the filename information is correct to serve up pxelinux.0 to the machines that want it.
+<p>
+<p>
+The idea in having cobbler manage DHCP is that it's closely related to PXE installation, and if we're maintaing a database about what systems we have and what they run, it makes sense to keep track of (and control) hostnames and IP's as well. Controlling DHCP from Cobbler makes this possible -- and it's one less thing the administrator has to configure.
+</p>
+
+<a name="enabling">
+<h2>Enabling DHCP Management</h2>
+</a>
+<p>
+Change /var/lib/cobbler/settings so that manage_dhcp has the value of 1.
+</p>
+<p>
+Edit /var/lib/cobbler/dhcp.template to taste -- mainly just making sure that the DHCP information is correct. You can add whatever else you want to that file, including anything you may have had from an existing setup.
+</p>
+<p>
+For Cobbler 0.5.0 and later, you can also optionally select dnsmasq instead of ISC dhcpd by changing the 'manage_dhcp_mode' to 'dnsmasq'. This is covered in more detail in the cobbler manpage. This allows, among other things, controlling the hostnames of provisioned machines as well as just the IP's.
+</p>
+
+<a name="howitworks">
+<h2>How It Works</h2>
+</a>
+<p>
+Suppose the following command is given:
+</p>
+<blockquote>
+<code>
+cobbler system add --name=AA:BB:CC:DD:EE:FF --pxe-address=192.168.1.1
+(newer versions:) cobbler system add --name=AA:BB:CC:DD:EE:FF --ip=192.168.1.1
+</code>
+</blockquote>
+<p>
+That will take the template file in /etc/cobbler/dhcp.template, fill in the appropriate fields, and generate a configuration that ensures that when AA:BB:CC:DD:EE:FF asks for an IP, it gets 192.168.1.1. The part to specify the address is not required, DHCP knows how to assign something within the configured range as well.
+</p>
+
+<a name="itaniums">
+<h2>Itaniums</h2>
+</a>
+<p>
+These are complicated. In order to PXE an Itanium correctly, one has to provide a "filename" value that references elilo, not pxelinux. Thankfully cobbler knows how to do this. When creating the distro object, make sure that --arch=ia64 is specified, and the right thing will be done here. Also note that to PXE Itaniums, the --pxe-address parameter is mandatory. This is due to a deficiency in LILO where it will ask for an encoded IP address, but will not ask for a PXE configuration file based on the MAC address. This is covered some in the cobbler manpage but bears repeating here.
+</p>
+<p>
+Also, sometimes Itaniums tend to hang during net installs... we're not sure why this is :)
+</p>
+
+<a name="dynamic">
+<h2>Dynamic DNS</h2>
+</a>
+<p>
+If you are using Cobbler >= 0.5.0, change 'manage_dhcp_mode' to dnsmasq, you can
+specify the parameter --hostname for any "cobbler system add" command where you also
+provide a MAC address. Restart dnsmasq before provisioning to apply changes.
+</p>
+<p>
+You may also use the Cobbler trigger mechanism documented on the <A HREF="http://et.redhat.com/page/Cobbler_Triggers">Cobbler Wiki</A> to write your own scripts that interface with your own DNS install, if not using dnsmasq.
+</p>
+
+<a name="static">
+<h2>Static IPs</h2>
+</a>
+<p>
+Don't like DHCP at all?
+</p>
+<p>
+Other than for configuring PXE, you can still use static IPs in your kickstarts and on
+your network with Cobbler. To do this, take
+advantage of the --ksmeta option mentioned in the manpage to customize your kickstart
+templates -- then create a cobbler system record for each object, defining --ksmeta
+variables for the intended IP addresses and so forth. You can then substitute in variables to create system specific kickstarts, while only maintaining one kickstart template
+in common between multiple systems.
+</p>
+<p>
+This will work with koan and "--system" out of the box. However, to PXE, you'll
+need at least a bare minimum DHCP config.
+</p>
+
diff --git a/website/new/docs/cobbler-guide.html b/website/new/docs/cobbler-guide.html
deleted file mode 100644
index 1d4671f..0000000
--- a/website/new/docs/cobbler-guide.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<a name="toc">
-<h2>Cobbler User Guide</h2>
-</a>
-
-Contents TBA
-
diff --git a/website/new/docs/cobbler-import.html b/website/new/docs/cobbler-import.html
new file mode 100644
index 0000000..f7d3219
--- /dev/null
+++ b/website/new/docs/cobbler-import.html
@@ -0,0 +1,98 @@
+<a name="toc">
+<h2>Cobbler Import</h2>
+</a>
+
+<a name="import">
+<h2>About</h2>
+<p>
+Suppose you want to set up a network boot server for a given distro, really really quickly. For this example, we'll use Fedora Core 6 as an example. What's the best way to do this? It's a command called "cobbler import", that can mirror content based on a DVD image or even an external rsync mirror or SSH location.
+</p>
+
+<a name="provserver">
+<h2>Setting Up A Provisioning Server From Scratch</h2>
+</a>
+<p>
+<blockquote>
+<ul>
+<li>yum install cobbler</li>
+<li>cobbler check</li>
+<li>/var/lib/cobbler/settings for 'server' and 'next-server' addresses</li>
+<li>Download the FC6 DVD image and mount it, either with a real CD or a loopback</li>
+<li>cobbler import --mirror=/media/dvd --name=FC-6</li>
+<li>cobbler sync</li>
+</ul>
+</blockquote>
+<p>
+You're done. Really.
+</p>
+<p>
+Alternatively, you could have also used:
+</p>
+<blockquote>
+cobbler import --mirror=rsync://servergoeshere/path/to/distro --name=FC-6
+</blockquote>
+<p>
+This would mirror from a public rsync server without needing the DVD image.
+</p>
+<p>
+The kickstarts used above will provision machines with a default password of "cobbler" and a really basic set of packages. For something more complicated, you may wish to edit the default kickstarts in /etc/cobbler and then re-run "cobbler sync" to apply those changes.
+</p>
+
+<a name="#reinstalls">
+<h2>Using That Server For Reinstallation</h2>
+</a>
+<p>
+Should you have a system you want to install that FC-6 on (instead of whatever it is running now), right now, you can do this:
+</p>
+<blockquote>
+<ul>
+<li>yum install koan</li>
+<li>koan --server=bootserver.example.com --list-profiles</li>
+<li>koan --replace-self --server=bootserver.example.com --profile=FC-6</li>
+<li>/sbin/reboot</li>
+</ul>
+</blockquote>
+<p>
+The system will install the new operating system after rebooting, hands off, no interaction required.
+</p>
+
+<a name="#virt">
+<h2>Using That Server For Virtualization</h2>
+<p>
+Want to install a xen guest instead? No problem.
+</p>
+<p>
+<blockquote>
+ <ul>
+ <li>yum install koan</li>
+ <li>koan --virt --server=bootserver.example.com --profile=FC-6-xen</li>
+ </ul>
+</blockquote>
+<p>
+Done.
+</p>
+
+<a name="#pxe">
+<h2>Using That Server For PXE</h2>
+<p>
+Note that so far we've only mentioned reinstalling and doing virtualized installs. PXE is easy too. If you want PXE, you have two options. If you want to run dhcp locally, just set manage_dhcp to 1 in /var/lib/cobbler/settings on the boot server, edit /etc/dhcp.template to change some defaults, and re run "cobbler sync". You're good. Cobbler will keep track of your dhcp files for you, and you'll never have to hand edit them. <a href="./docs/cobbler-dhcp.php">Read more about DHCP management here</A>.
+</p>
+<p>
+If the dhcp server is somewhere else, you can get your dhcp server admin to point at your box as a "next-server". Easy enough.
+</p>
+<p>
+Once you get PXE set up, all of the profiles will, by name, show up in PXE menus when the machines network boot. Type "menu" at the prompt and choose one from the list. Or just don't do anything and the machine will default through to local booting.
+<blockquote>
+Tip: if you're using RHEL4, install the latest syslinux to enable the PXE menu support.
+</blockquote>
+</p>
+<p>
+Should you want to pin a particular system to a particular profile, just run:
+</p>
+<blockquote>
+cobbler system add --name=$mac-address --profile=$profile-name
+</blockquote>
+<p>
+Then the above machine will boot directly to the profile of choice without bringing up the menu. Don't forget to read the manpage docs as there are more options for customization and control available.
+</p>
+
diff --git a/website/new/docs/cobbler-repos.html b/website/new/docs/cobbler-repos.html
new file mode 100644
index 0000000..bfd7464
--- /dev/null
+++ b/website/new/docs/cobbler-repos.html
@@ -0,0 +1,94 @@
+<a name="toc">
+<h2>Cobbler Repository Management</h2>
+</a>
+
+<a name="about">
+<h2>About</h2>
+<p>
+This is a walkthrough of how to set up cobbler to be a full fledged mirror of everything install and update related that you might ever be interested in.
+</p>
+<p>
+Why would you be interested in this?
+</p>
+<p>
+Suppose you manage a large number of machines and are (A) not allowed to get to the outside world, (B) bandwidth constrained, or (C) wanting to get access to 3rd party packages including custom yum repositories.
+</p>
+<p>
+All of these are good reasons to want a mirror server for all things kickstart and yum related. Cobbler can do that for you.
+</p>
+
+<a name="howto">
+<h2>How To</h2>
+</a>
+<p>
+he following instructions require Cobbler 0.4.6 or later and walk through an example of setting up a mirror of Fedora Core 6's install tree, extras, and updates. This will require a good bit of hard disk space, so be prepared :). These same commands work for all varieties of RHEL, Fedora, or Centos.
+</p>
+<p>
+First, follow the setup for a DVD import here using the Fedora Core 6 install media. http://et.redhat.com/page/Cobbler_Import. If you did your import with Cobbler 0.4.5 or earlier, please do it again -- import now collects more data about the install trees that will be useful to cobbler.
+</p>
+<p>
+Once the import is complete, we'll add the mirrors...
+</p>
+<blockquote>
+cobbler repo add --mirror=http://mirrors.kernel.org/fedora/core/updates/6/i386/ --name=fc6i386updates --local-filename=fedora-updates
+</blockquote>
+<blockquote>
+cobbler repo add --mirror=http://mirrors.kernel.org/fedora/extras/6/i386/ --name=fc6i386extras --local-filename=fedora-extras
+</blockquote>
+<p>
+These are just a few common examples. Say you have a RHEL5 or Centos4 machine? Perhaps you would want to add something from freshrpms, or someplace else? It works the same way.
+</p>
+<p>
+Now that we've added the mirrors, let's pull down the content. This will take a little while, but subsequent updates won't take nearly as long.
+</p>
+<blockquote>
+cobbler reposync
+</blockquote>
+<p>
+Now, that the repositories are mirrored locally, let's create a cobbler profile that will be able to automatically install from the above repositories and also configure clients to use the new mirror.
+</p>
+<blockquote>
+cobbler profile add --name=fc6i386special --repos="fc6i386updates fc6i386extras" --distro=FC6-i386 --kickstart=/etc/cobbler/kickstart_fc6.ks
+</blockquote>
+<p>
+Now, any machines installed from this mirror won't have to hit the outside world for any content they may need during install or with yum. They'll ask for content from the cobbler server instead. Cool.
+</p>
+
+<a name="#rhn">
+<h2>RHN</h2>
+</a>
+<p>
+This is rather experimental, but if you have a provisioning need for fast local installs without hitting an outside server repeatedly (say you have a slow pipe), you can try:
+</p>
+<blockquote>
+cobbler repo-add --name=insertnamehere --mirror=rhn://rhn-channel-name
+</blockquote>
+<p>
+That's just the channel-name, no server. This only works on RHEL5+ and you'll need entitlements for the channel in question.
+</p>
+
+<a name="#updates">
+<h2>Updates</h2>
+</a>
+<p>
+As you're mirroring repositories that change (and probably even include some security updates from time to time), putting "cobbler reposync" on crontab would be a good idea. Cobbler reposync will update the content in all of your repositories.
+</p>
+<p>
+You can disable updating of certain repos that you've already pulled down and don't wish to contact again by flipping a bit in /var/lib/cobbler/repos if you really want to.
+</p>
+
+<a name="#review">
+<h2>To Review</h2>
+</a>
+<p>
+The above steps have set up your cobbler server as a full fledged mirror, not just for install trees, but also for future package installs and updates with yum.
+</p>
+<p>
+Installation content during anaconda and afterwards will be pulled from your cobbler mirror, not the outside world. You should see faster installs and won't have to worry about whether your client machines have outside internet connectivity.
+</p>
+<p>
+Cobbler handles all of the yum, reposync, and createrepo magic for you, so you don't have to know how they work. Plus, the kickstarts are automatically aware of the configuration and built themselves out based on what repos are defined. Bottom line: you don't need to know how any of this stuff works. Cool.
+</p>
+<p>
+If you have questions or want to clear up something in this document, ask on et-mgmt-tools@redhat.com or stop by #cobbler on irc.freenode.net.
+</p>
diff --git a/website/new/docs/cobbler.html b/website/new/docs/cobbler.html
index a16bbc6..dd87345 100644
--- a/website/new/docs/cobbler.html
+++ b/website/new/docs/cobbler.html
@@ -1,13 +1,3 @@
-<?xml version="1.0" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>NAME</title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:root@localhost" />
-</head>
-
-<body style="background-color: white">
<p><a name="__index__"></a></p>
<!-- INDEX BEGIN -->
@@ -573,6 +563,3 @@ files in /etc/cobbler that can be edited.</p>
<h1><a name="author">AUTHOR</a></h1>
<p>Michael DeHaan &lt;<a href="mailto:mdehaan@redhat.com">mdehaan@redhat.com</a>&gt;</p>
-</body>
-
-</html>
diff --git a/website/new/docs/cobbler_summit.odp b/website/new/docs/cobbler_summit.odp
new file mode 100644
index 0000000..f8aa707
--- /dev/null
+++ b/website/new/docs/cobbler_summit.odp
Binary files differ
diff --git a/website/new/docs/koan.html b/website/new/docs/koan.html
index cbd0c8c..807bf8d 100644
--- a/website/new/docs/koan.html
+++ b/website/new/docs/koan.html
@@ -1,13 +1,3 @@
-<?xml version="1.0" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>NAME</title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:root@localhost" />
-</head>
-
-<body style="background-color: white">
<p><a name="__index__"></a></p>
<!-- INDEX BEGIN -->
@@ -62,6 +52,4 @@
<h1><a name="author">AUTHOR</a></h1>
<p>Michael DeHaan &lt;<a href="mailto:mdehaan@redhat.com">mdehaan@redhat.com</a>&gt;</p>
-</body>
-</html>
diff --git a/website/new/documentation.html b/website/new/documentation.html
index 9f2daa0..7e8e5d8 100644
--- a/website/new/documentation.html
+++ b/website/new/documentation.html
@@ -2,15 +2,17 @@
<h3>Available Documents</h3>
-<p>The following docs are available for Cobbler:</p>
+<p>The following docs are available for Cobbler and Koan. Starting with the manpage documentation for cobbler and koan is highly recommended.</p>
<ul>
<!--
<li><a href="cobbler-guide.php">Cobbler Guide</a></li>
-->
-<li><a href="http://et.redhat.com/page/Cobbler_Wiki">Cobbler Wiki Articles</a></li>
-<li><a href="docs/cobbler.html">Cobbler Manpage</a></li>
-<li><a href="docs/koan.html">Koan Manpage</a></li>
+<li><a href="./cobbler-manpage.php">Cobbler Manpage</a></li>
+<li><a href="./koan-manpage.php">Koan Manpage</a></li>
+<li><a href="./cobbler-import.php">A Quickstart Guide on Using "import"</a></li>
+<li><a href="./cobbler-repos.php">Using Cobbler to manage yum repositories</a></li>
+<li><a href="./cobbler-dhcp.php">Cobbler's DHCP management features</a></li>
</ul>
</ul>
@@ -19,6 +21,16 @@
<ul>
<li><a href="docs/cobbler_sumit.odp">Red Hat Summit 5/2007</A></li>
-<li><a href="docs/cobbler.odp">Cobbler slides</A> .. somewhat dated</li>
+<li><a href="docs/cobbler.odp">Older Slides</A> (somewhat out of date)</li>
+</ul>
+
+<h3>More Advanced Topics</h3>
+
+Some of these topics are developer-centric and evolve frequently, so they're still hosted on our companion Wiki. Stop by #cobbler on irc.freenode.net if you would like to ask questions!
+
+<ul>
+<li><a HREF="http://et.redhat.com/page/Cobbler_API">Cobbler API</a></li>
+<li><a HREF="http://et.redhat.com/page/Cobbler_XMLRPC">XMLRPC interface</a></li>
+<li><a href="http://et.redhat.com/page/Cobbler_Triggers">Triggers Extension Mechanism</a></li>
</ul>
diff --git a/website/new/documentation.php b/website/new/documentation.php
index 63ba719..af504bb 100755
--- a/website/new/documentation.php
+++ b/website/new/documentation.php
@@ -9,7 +9,7 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="description" content="" />
<meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Cobbler</title>
<link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
</head>
diff --git a/website/new/download.html b/website/new/download.html
index 1f4f134..57a5086 100644
--- a/website/new/download.html
+++ b/website/new/download.html
@@ -18,14 +18,15 @@ Source RPMS and tarballs are available <A HREF="http://cobbler.et.redhat.com/dow
</blockquote>
<p>
-<h4>Downloading Binaries for Users of Fedora Core 5/6, and F7</h4>
+<h4>Downloading Binaries for Fedora Users</h4>
<p>
<blockquote>
-yum install cobbler # on the boot server
-yum install koan # on target systems
+yum install cobbler # on the boot server</br>
+yum install koan # on target systems
</blockquote>
</p>
+
<h4>Build Instructions for RHEL4</h4>
<p>
<blockquote>
@@ -51,7 +52,7 @@ yum install koan # on target systems
</blockquote>
</p>
-<h4>Download Instructions For Centos Users</h4>
+<h4>Centos Users</h4>
<p>
<blockquote>
Cobbler will be part of Centos Extras shortly and will then be yum installable. Until then, you will want to rebuild the source RPMs. The process will be as in RHEL, though you should get the dependencies from "yum install" instead of the above hard-coded URLs.
diff --git a/website/new/download.php b/website/new/download.php
index f33b7d6..29cc729 100755
--- a/website/new/download.php
+++ b/website/new/download.php
@@ -10,7 +10,7 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="description" content="" />
<meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Cobbler</title>
<link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
</head>
diff --git a/website/new/faq.html b/website/new/faq.html
index 944f581..0aa89ab 100644
--- a/website/new/faq.html
+++ b/website/new/faq.html
@@ -7,6 +7,7 @@
<li><a href="#supported">What Operating Systems Are Supported?</a></li>
<li><a href="#reinstalls">What are my non-PXE install options?</a></li>
<li><a href="#virt">How are virtual systems installed?</a></li>
+<li><a href="#architecture">How does Cobbler work internally?</a></li>
<li><a href="#contribute">How can I contribute?</a></li>
</ul>
@@ -30,18 +31,28 @@ Cobbler runs on RHEL 4 and later, Fedora 5 and later, and Centos 4 and later. K
<a name="reinstalls">
<dt>What are my non-PXE install options?</dt>
</a>
- <dd>Cobbler's helper program koan can be used on the target system to reinstall it's operating system to start a fully-automated reinstall of another operating system. This solution is ideal for those users who can not take advantage of PXE due to hardware, network, or policy constraints. For more information, see the <A HREF="./docs/koan.html">koan</A> manpage documentation.
+ <dd>Cobbler's helper program koan can be used on the target system to reinstall it's operating system with another operating system. This solution is ideal for those users who can not take advantage of PXE due to hardware, network, or policy constraints. For more information, see the <A HREF="./koan-manpage.php">koan</A> manpage documentation.
<br />
<a href="#questions" class="back-to-top">Back to top</a>
</dd>
<a name="virt">
<dt>How are virtual systems installed?</dt>
</a>
- <dd>Cobbler's helper program, koan, is invoked on the remote host system, and it pulls down information from the remote cobbler server to begin a fully automated installation of a virtual guest. This works out of the box for any distribution that contains a Xen kernel. For more information, see the <A HREF="./docs/koan.html">koan</A> manpage documentation.
+ <dd>Cobbler's helper program, koan, when invoked on the remote host system, pulls down information from the remote cobbler server to begin a fully automated installation of a virtual guest. This works out of the box for any distribution that contains a Xen kernel. For more information, see the <A HREF="./koan-manpage.php">koan</A> manpage documentation.
<br />
<a href="#questions" class="back-to-top">Back to top</a>
</dd>
+<a name="architecture">
+<dt>How does Cobbler work internally?</dt>
+</a>
+<dd>
+When the administrator on the Cobbler server runs Cobbler commands, cobbler updates a configuration tree, which is stored in /var/lib/cobbler. Data from this configuration database is used to update various entities on the target operating system. Cobbler will restart services, as well as create trees of files in /tftpboot and /var/www/cobbler -- for use with PXE and koan, respectively.
+<br/>
+Koan interacts with cobbler by retrieving data over XMLRPC. Cobbler serves up XMLRPC using "cobblerd", which also has the dual purpose of logging syslog data from kickstart -- which is used in Cobbler's kickstart tracking feature. For a better understanding of how this works, see the <A HREF="./cobbler-manpage.php">Cobbler</A> manpage documentation.
+<a href="#questions" class="back-to-top">Back to top</a>
+</dd>
+
<a name="contribute">
<dt>How can I contribute?</dt>
</a>
@@ -52,3 +63,4 @@ Send in bug reports, patches, ideas, or comments. We're interested in hearing a
</dd>
+
diff --git a/website/new/faq.php b/website/new/faq.php
index c7a1528..0fbd05e 100755
--- a/website/new/faq.php
+++ b/website/new/faq.php
@@ -10,7 +10,7 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="description" content="" />
<meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Cobbler</title>
<link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
</head>
diff --git a/website/new/index.html b/website/new/index.html
deleted file mode 100644
index 5638630..0000000
--- a/website/new/index.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="description" content="" />
-<meta name="keywords" content="" />
-<!--
-<link rel="alternate" type="application/rss+xml" title="RSS feed" href="??" />
-<link rel="stylesheet" type="text/css" href="/css/print.css" media="print" />
--->
-<title>UMP: Update and Management Platform</title>
-
-<!--
- <link rel="stylesheet" href="/css/home.css" type="text/css" media="all" />
--->
-
-<style type="text/css">
-
-body {
- background-color: black;
-}
-
-img {
- border: none;
-}
-
-/* site-wide font specifications */
-
-body, ul, li, p, h1, h2, h3 {
- font-family: "Liberation Sans", "Helvetica", "Luxi Sans", "Bitstream Vera Sans", sans-serif;
- color: white;
-}
-
-ul#nav {
- text-transform: uppercase;
- letter-spacing: -.05em;
- list-style-type: none;
- font-family: "URW Gothic", "Liberation Sans", "Helvetica", "Luxi Sans", "Bitstream Vera Sans", sans-serif;
- float: left;
- margin-right: 32px;
- margin-bottom: 100%;
-}
-
-ul#nav li a {
- color: #59cbe1;
- text-decoration: none;
-}
-
-ul#nav li#active {
- list-style-image: url('img/current-page.png');
-}
-
-div#main {
- background-color: #212121;
- padding: 20px 0px;
- margin: 0px 3%;
- border-top: 1px solid #59cbe1;
- border-bottom: 1px solid #59cbe1;
-}
-
-div#content {
- width: 80%;
-}
-
-div#content h2 {
- font-size: medium;
- font-weight: 900;
-}
-
-div#content p {
- font-size: small;
- color: #ccc;
-}
-
-</style>
-
-</head>
-
-<body>
-
-<h1 id="masthead">
-<a href="/"><img src="img/logo-ump.png" alt="UMP: Update and Management Platform" /></a>
-</h1>
-
-<div id="main">
-
- <ul id="nav">
- <li id="active">About</li>
- <li><a href="#">News</a></li>
- <li><a href="#">Download</a></li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#">Communicate</a></li>
- </ul>
-
-<div id="content">
-
-<h2>Introducing the next generation of systems management</h2>
-
-<p>There are many systems management tools out there, including many great free and open source tools. These tools are numerous and disparate, however, making it a complex and time-consuming process to select which tools ot use and how to connect the pieces together.</p>
-
-<p>By introducing a free and open source platform upon which management tools can be built and adhere to, the Update &amp; Management Platform (UMP) will make it simpler for system administrators to choose and implement whichever management tools they desire.</p>
-
-<h2>Free to use, developed openly</h2>
-
-<p>Use UMP freely to get your system update and management tasks done. Get involved with the UMP developers or become an UMP developer in UMP's open development community to get your system update and management tasks done <strong>better</strong>.</p>
-
-<p>Your feedback is valuable to us. Let us know which UMP features are most valuable to you, which ones are not, and which ones you'd like to see. Become an UMP developer and help us reach our vision. Either way, we'd love to hear from you.</p>
-
-</div>
-
-</div>
-
-</body>
-</html>
diff --git a/website/new/index.php b/website/new/index.php
index b0b95b0..1aedbe7 100755
--- a/website/new/index.php
+++ b/website/new/index.php
@@ -7,9 +7,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="description" content="" />
-<meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<meta name="keywords" content="pxe,linux,kickstart,cobbler,koan,xen,virtualization,install,boot,server,mirror,mirroring,redhat,fedora,centos" />
+<title>Cobbler: Provisioning Made Simple</title>
<link rel="stylesheet" href="./css/style.css" type="text/css" media="all" />
</head>
diff --git a/website/new/koan-manpage.php b/website/new/koan-manpage.php
new file mode 100755
index 0000000..ad400df
--- /dev/null
+++ b/website/new/koan-manpage.php
@@ -0,0 +1,44 @@
+<?php
+ $current_page = 'documentation';
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="description" content="" />
+<meta name="keywords" content="" />
+<title>Cobbler</title>
+
+ <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
+</head>
+
+<body>
+<div id="wrap">
+<?php
+ include("top.html");
+?>
+
+<div id="main">
+ <div id="sidebar">
+<?php
+ include("nav.php");
+?>
+ </div>
+
+<div id="content">
+<?php
+ include("docs/koan.html");
+?>
+
+</div>
+</div>
+<div id="footer">
+<?php
+ include("footer.html");
+?>
+</div>
+</div>
+</body>
+</html>
diff --git a/website/new/news.php b/website/new/news.php
index 6aa58a8..8b4fb99 100755
--- a/website/new/news.php
+++ b/website/new/news.php
@@ -10,7 +10,7 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="description" content="" />
<meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Cobbler</title>
<link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
</head>
diff --git a/website/push.sh b/website/push.sh
index a77f816..594c50b 100644
--- a/website/push.sh
+++ b/website/push.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-scp -r new/* et.redhat.com:/var/www/sites/cobbler.et.redhat.com/new
+scp -r new/* et.redhat.com:/var/www/sites/cobbler.et.redhat.com