From 84c10e844350ce0152b3618c08cb4ec13ee83143 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Mon, 29 Oct 2012 19:41:22 +0000
Subject: [PATCH] new config file structuring

---
 lam/docs/manual-sources/howto.xml | 48 +++++++++++++++++++++++++++++++
 lam/templates/login.php           |  1 +
 2 files changed, 49 insertions(+)

diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index b2bd34ac..22f3ef02 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -703,6 +703,54 @@ Have fun!
 
           <para>LAM will automatically migrate your existing files as soon as
           the login page is loaded.</para>
+
+          <para>Special install instructions:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para>Debian: none, config files will be migrated when opening
+              LAM's login page</para>
+            </listitem>
+
+            <listitem>
+              <para>Suse/Fedora RPM:</para>
+
+              <itemizedlist>
+                <listitem>
+                  <para>Run "rpm -e ldap-account-manager
+                  ldap-account-manager-lamdaemon"</para>
+                </listitem>
+
+                <listitem>
+                  <para>You may get warnings like "warning:
+                  /var/lib/ldap-account-manager/config/profiles/default.user
+                  saved as
+                  /var/lib/ldap-account-manager/config/profiles/default.user.rpmsave"</para>
+                </listitem>
+
+                <listitem>
+                  <para>Please rename all files "*.rpmsave" and remove the
+                  file extension ".rpmsave". E.g. "default.user.rpmsave" needs
+                  to be renamed to "default.user".</para>
+                </listitem>
+
+                <listitem>
+                  <para>Install the LAM packages with "rpm -i". E.g. "rpm -i
+                  ldap-account-manager-4.0-0.suse.1.noarch.rpm".</para>
+                </listitem>
+
+                <listitem>
+                  <para>Open LAM's login page in your browser to complete the
+                  migration</para>
+                </listitem>
+              </itemizedlist>
+            </listitem>
+
+            <listitem>
+              <para>tar.gz: standard upgrade steps, config files will be
+              migrated when opening LAM's login page</para>
+            </listitem>
+          </itemizedlist>
         </section>
 
         <section>
diff --git a/lam/templates/login.php b/lam/templates/login.php
index 8e691f0e..642e353e 100644
--- a/lam/templates/login.php
+++ b/lam/templates/login.php
@@ -187,6 +187,7 @@ function display_LoginPage($config_object) {
 		}
 		else {
 			upgradeConfigToServerProfileFolders(getConfigProfiles());
+			StatusMessage('INFO', 'Config file migration finished.');
 		}
 	}
 	// copy any missing default profiles