doc: Add quickstart updates from Fabian Affolter

Signed-off-by: Sol Jerome <solj@ices.utexas.edu>

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5840 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 22 insertions, 96 deletions

diff --git a/doc/quickstart/ubuntu.txt b/doc/quickstart/ubuntu.txt
index a45d6744d..db9719739 100644
--- a/doc/quickstart/ubuntu.txt
+++ b/doc/quickstart/ubuntu.txt
@@ -2,16 +2,19 @@
 
 .. _quickstart-ubuntu:
 
+=====================
 Quickstart for Ubuntu
-===================================================
+=====================
 
 .. note::
-    This particular how to was done on lucid, but should apply to any other `recent`_ version of Ubuntu.
 
-.. _recent: http://www.ubuntu.com/products/ubuntu/release-cycle
+    This particular how to was done on lucid, but should apply to any
+    other `recent-ubuntu-release`_ version of Ubuntu.
+
+.. _recent-ubuntu-release: http://www.ubuntu.com/products/ubuntu/release-cycle
 
 Install Bcfg2
--------------
+=============
 
 We first need to install the server. For this example, we will use the
 bcfg2 server package from the bcfg2 `PPA`_ (note that there is also a
@@ -20,12 +23,12 @@ version available in the ubuntu archives, but it is not as up to date).
 .. _PPA: https://launchpad.net/~bcfg2/+archive/ppa
 
 Add the Ubuntu PPA listing to your APT sources
-++++++++++++++++++++++++++++++++++++++++++++++
+----------------------------------------------
 
 See http://trac.mcs.anl.gov/projects/bcfg2/wiki/PrecompiledPackages#UbuntuLucid
 
 Install bcfg2-server
-++++++++++++++++++++
+--------------------
 ::
 
     aptitude install bcfg2-server
@@ -35,18 +38,18 @@ Remove the default configuration preseeded by the ubuntu package::
     root@lucid:~# rm -rf /etc/bcfg2* /var/lib/bcfg2
 
 Initialize your repository
---------------------------
+==========================
 
 Now that you're done with the install, you need to intialize your
 repository and setup your bcfg2.conf. bcfg2-admin init is a tool which
 allows you to automate this process.::
 
     root@lucid:~# bcfg2-admin init
-    Store bcfg2 configuration in [/etc/bcfg2.conf]: 
-    Location of bcfg2 repository [/var/lib/bcfg2]: 
+    Store bcfg2 configuration in [/etc/bcfg2.conf]:
+    Location of bcfg2 repository [/var/lib/bcfg2]:
     Input password used for communication verification (without echoing; leave blank for a random):
     What is the server's hostname: [lucid]
-    Input the server location [https://lucid:6789]: 
+    Input the server location [https://lucid:6789]:
     Input base Operating System for clients:
     1: Redhat/Fedora/RHEL/RHAS/Centos
     2: SUSE/SLES
@@ -70,7 +73,7 @@ allows you to automate this process.::
 Of course, change responses as necessary.
 
 Start the server
-----------------
+================
 
 You are now ready to start your bcfg2 server for the first time.::
 
@@ -100,13 +103,13 @@ Run bcfg2 to be sure you are able to communicate with the server::
     Unmanaged entries:      382
 
 Bring your first machine under Bcfg2 control
---------------------------------------------
+============================================
 
 Now it is time to get your first machine's configuration into your Bcfg2
 repository. Let's start with the server itself.
 
 Setup the `Packages`_ plugin
-++++++++++++++++++++++++++++
+----------------------------
 
 .. _Packages: http://trac.mcs.anl.gov/projects/bcfg2/wiki/Plugins/Packages
 
@@ -238,7 +241,7 @@ Now we restart the bcfg2-server::
     Dec 17 22:37:28 lucid bcfg2-server[17937]: Processed 17 fam events in 0.502 seconds. 0 coalesced
 
 Start managing packages
-+++++++++++++++++++++++
+-----------------------
 
 Add a base-packages bundle. Let's see what happens when we just populate
 it with the ubuntu-standard package.
@@ -405,7 +408,7 @@ As you can see below, I no longer have any unmanaged packages. ::
      Service:bcfg2-server  Service:grub-common   Service:ondemand      Service:rsync         Service:ssh
 
 Manage services
-+++++++++++++++
+---------------
 
 Now let's clear up the unmanaged service entries by adding the following
 entries to our bundle...
@@ -469,84 +472,7 @@ Now we run the client and see there are no more unmanaged entries! ::
 
     All entries correct.
 
-Dynamic (web) Reports
----------------------
-
-First, run ``aptitude install python-django apache2
-libapache2-mod-python``.
-
-* Now we need to create the sqlite database::
-
-      root@lucid:~# python /usr/share/pyshared/Bcfg2/Server/Reports/manage.py syncdb
-      Creating table auth_permission
-      Creating table auth_group
-      Creating table auth_user
-      Creating table auth_message
-      Creating table django_content_type
-      Creating table django_session
-      Creating table django_site
-      Creating table django_admin_log
-      Creating table reports_client
-      Creating table reports_ping
-      Creating table reports_interaction
-      Creating table reports_reason
-      Creating table reports_entries
-      Creating table reports_entries_interactions
-      Creating table reports_performance
-      Creating table reports_internaldatabaseversion
-
-      You just installed Django's auth system, which means you don't have any superusers defined.
-      Would you like to create one now? (yes/no): no
-      Installing index for auth.Permission model
-      Installing index for auth.Message model
-      Installing index for admin.LogEntry model
-      Installing index for reports.Client model
-      Installing index for reports.Ping model
-      Installing index for reports.Interaction model
-      Installing index for reports.Entries model
-      Installing index for reports.Entries_interactions model
-
-* Add DBStats to the plugins line of bcfg2.conf. The resulting [server]
-  section should look something like this::
-
-      [server]
-      repository = /var/lib/bcfg2
-      plugins = Base,Bundler,Cfg,DBStats,Metadata,Packages,Probes,Rules,SSHbase
-
-* Start/restart the bcfg2 server
-* Run the bcfg2 client in order to populate the statistics database
-  (this run should take a bit longer since you are uploading the client
-  statistics to the database).
-* Download the static reports content::
-
-      root@lucid:~# cd /var/www/
-      root@lucid:/var/www# svn co https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2/reports
-
-* Configure Apache using
-* :ref:`dynamic-http-install` as a guide
-* Copy server/statistics sections of bcfg2.conf to
-  ``/etc/bcfg2-web.conf`` (make sure it is world-readable). You should
-  then have something like this::
-
-      [server]
-      repository = /var/lib/bcfg2
-      plugins = Base,Bundler,Cfg,DBStats,Metadata,Packages,Probes,Rules,SSHbase
-
-      [statistics]
-      sendmailpath = /usr/lib/sendmail
-      database_engine = sqlite3
-      # 'postgresql', 'mysql', 'mysql_old', 'sqlite3' or 'ado_mssql'.
-      database_name =
-      # Or path to database file if using sqlite3.
-      #<repository>/etc/brpt.sqlite is default path if left empty
-      database_user =
-      # Not used with sqlite3.
-      database_password =
-      # Not used with sqlite3.
-      database_host =
-      # Not used with sqlite3.
-      database_port =
-      # Set to empty string for default. Not used with sqlite3.
-      web_debug = True
-
-* Restart apache and point a browser to your bcfg2 server
+Dynamic (web) reports
+=====================
+
+See installation instructions at :ref:`server-reports-install`