X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=INSTALL;h=76d22a77a14c1c5d4eeeec63d7bc459781af5201;hb=51201aa52650f9f0b27d0915a56733ed6bf40333;hp=0e0a048e86031c897079fa418a95c0a1f828b4d7;hpb=c1772c69e8ac4a09ad195ea40ec066b27927b7ff;p=freeradius.git

diff --git a/INSTALL b/INSTALL
index 0e0a048..76d22a7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -3,7 +3,7 @@
   Ignore this file if you have a pre-installed binary package.
 
 
-1a. SIMPLE INSTALLATION
+2. SIMPLE INSTALLATION
 
   If you do not need to modify the default configuration, then take
 the following steps to build and install the server:
@@ -23,7 +23,48 @@ needs for EAP.
 account.
 
 
-1b. CUSTOM INSTALLATION
+3. UPGRADING
+
+  The installation process will not over-write your existing
+configuration files.  It will, however, warn you about the files it
+did not install.
+
+  For users upgrading from 1.x to 2.0, we STRONGLY recommend that 2.0
+be installed in a different location than the existing 1.x
+installation.  Any local policies can then be migrated gradually to
+the new 2.0 configuration.  While we have put a lot of time into
+ensuring that 2.0 is mostly backwards compatible with 1.x, it is not
+COMPLETELY backwards compatible.  There are differences that mean it
+is simpler and safer to migrate your configurations.
+
+  If you are upgrading an existing installation, please be aware that
+at least one default virtual server SHOULD be used.  If you don't need
+virtual servers, your configuration can remain mostly unchanged.
+
+  If you do need virtual servers, we recommend creating a default one
+by editing radiusd.conf, and wrapping all of the authorize,
+authenticate, etc. sections in one server block, as follows:
+
+...
+  server {	# line to add
+	authorize {
+		...
+	}
+	authenticate {
+		...
+	}
+	accounting {
+		...
+	}
+	...
+	post-proxy {
+		...
+	}
+  }  		# matching line to add
+...
+
+
+4. CUSTOM INSTALLATION
 
   FreeRADIUS has autoconf support. This means you have to run
 ./configure, and then run make.  To see which configuration options
@@ -49,8 +90,11 @@ following list is a selection from the available flags:
 and MAY install the configuration files.  If you have not installed a
 RADIUS server before, then the configuration files for FreeRADIUS will
 be installed.  If you already have a RADIUS server installed, then
-FreeRADIUS WILL NOT over-write your current configuration.  The "make
-install" process will warn you about the files it could not install.
+
+	** FreeRADIUS WILL NOT over-write your current configuration. **
+
+  The "make install" process will warn you about the files it could
+not install.
 
   If you DO see a warning message about files that could not be
 installed, the it is YOUR RESPONSIBILITY to ensure that the new server