Improved the doc for the release

Documentation/SOGoNativeOutlookConfigurationGuide.asciidoc

@@ -268,16 +268,16 @@ from this guide.
 Samba4/OpenChange are not available for now on CentOS 5 i386/x86_64,
 CentOS 6 i386 and CentOS 7.
 
-Debian 7.0 (Wheezy) and Ubuntu 12.04 (Precise Pangolin)
+Debian 7 (Wheezy) and Ubuntu 12.04 (Precise Pangolin)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 SOGo, OpenChange and the SOGo OpenChange backend are now
 available from SOGo's web site. Please follow the instructions from
 http://www.sogo.nu/english/downloads/backend.html to setup your
 apt sources.
 
-For Samba 4, you need to use the _wheezy-backports_ repository. To do so, create
+On Debian7, for Samba 4, you need to use the _wheezy-backports_ repository.
-`/etc/apt/sources.list.d/backports.list`:
+To do so, create `/etc/apt/sources.list.d/backports.list`:
 
  deb http://http.debian.net/debian wheezy-backports main
 
@@ -303,7 +303,12 @@ apt-get install openchangeserver \
                 openchangeproxy \ 
                 python-ocsmanager \
                 mysql-server \
-                python-mysqldb
+                python-mysqldb \
+                openchange-ocsmanager \
+                openchange-rpcproxy \
+                python-sievelib \
+                python-spyne \
+                python-rpclib
 ----
 
 Once the packages are installed, refer to the _Configuration_ chapter
@@ -315,10 +320,10 @@ disable the upstart check. For more details, refer to:
 https://wiki.samba.org/index.php/Samba4/InitScript
 
 
-Ubuntu 14.04 (Trusty Tahr)
+Debian 8 (Jessie) and Ubuntu 14.04 (Trusty Tahr)
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-For Ubuntu 14.04, you must not use the Debian Wheezy backports.
+For Debian 8 and Ubuntu 14.04, you must not use the Debian Wheezy backports.
 
 Please follow the instructions from
 http://www.sogo.nu/english/downloads/backend.html to setup your
@@ -341,12 +346,26 @@ apt-get install openchangeserver \
                 openchangeproxy \ 
                 python-ocsmanager \
                 mysql-server \
-                python-mysqldb
+                python-mysqldb \
+                openchange-ocsmanager \
+                openchange-rpcproxy \
+                python-sievelib \
+                python-spyne \
+                python-rpclib
 ----
 
 Once the packages are installed, refer to the _Configuration_ chapter
 from this guide.
 
+[NOTE]
+The `ocsmanager.conf` and `rpcproxy.conf` are currently located in
+`/etc/apache2/conf.d`. These should be moved to `/etc/apache2/conf-available`.
+This is a packaging error that will soon be fixed.
+
+[NOTE]
+You might have to adjust the `rpcproxy.conf` configuration file to add the
+`Require all granted` permission if you get Apache errors such as
+`client denied by server configuration`.
 
 Configuration
 -------------
@@ -533,7 +552,7 @@ services can be found in `/etc/httpd/conf.d/ocsmanager.conf` and
 `/etc/httpd/conf.d/rpcproxy.conf`.
 
 For Debian-based distributions, these files can be found
-in `/etc/apache2/conf.d/`.
+in `/etc/apache2/conf.d/` or `/etc/apache2/conf-available`.
 
 The configuration requires three Apache modules:  _mod_proxy_,
 _mod_proxy_http_ and _mod_wsgi_. These are usually already installed but
@@ -541,13 +560,17 @@ might need to be activated on Debian-based installations:
 
  a2enmod proxy proxy_http wsgi
 
+The OCS Manager and RPC Proxy configuration module can be enabled using:
+
+ a2enconf ocsmanager
+ a2enconf rpcproxy
+
 On RHEL-based distributions, make sure the `LoadModule` directive is
-uncommented in `/etc/httpd/conf.d/wsgi.conf` (or
+uncommented in `/etc/httpd/conf.d/wsgi.conf`.
-`python26-mod_wsgi.conf` on RHELv5).
 
 The _reqtimeout_ apache module is known to cause problems when using the
 default configuration shipped with Debian-based systems. On such
-distributions, apache will close (HTTP/1.1 500) any HTTP request for
+distributions, Apache will close (HTTP/1.1 500) any HTTP request for
 which the HTTP body hasn't arrived in 10 seconds.
 
 While this is arguably good practice with regular HTTP, it will disrupt
@@ -567,9 +590,100 @@ On Debian-based distributions, do:
 
  update-rc.d apache2 defaults && /etc/init.d/apache2 restart
 
-[NOTE]
+Finally, you must adjust the OCS Manager configuration file, which is
-Debian-based distributions are not supported anymore for
+located in `/etc/ocsmanager/ocsmanager.ini`. You should enable LDAP-based
-OCSManager/rpcproxy. Support will soon resume.
+authentication in the `main` section and configure it accordingly. You should
+also enable rpcproxy. You file should be similar to this one:
+
+----
+[DEFAULT]
+debug = true
+email_to = you@yourdomain.com
+smtp_server = localhost
+error_email_from = paste@localhost
+
+[main]
+auth = ldap
+mapistore_root = /var/lib/samba/private
+mapistore_data = /var/lib/samba/private/mapistore
+debug = yes
+
+[auth:file]
+
+[auth:ldap]
+host = ldap://127.0.0.1
+port = 389
+bind_dn = cn=administrator,cn=Users,dc=example,dc=com
+bind_pw = %1OpenChange
+basedn = cn=Users,dc=example,dc=com
+
+[auth:single]
+username = openchange
+password = {SSHA}I6Hy5Wv0wuxyXvMBFWFQDVVN12_CLaX9
+
+[server:main]
+use = egg:Paste#http
+host = 127.0.0.1
+port = 5000
+protocol_version = HTTP/1.1
+
+[app:main]
+use = egg:ocsmanager
+full_stack = true
+static_files = true
+cache_dir = %(here)s/data
+beaker.session.key = ocsmanager
+beaker.session.secret = SDyKK3dKyDgW0mlpqttTMGU1f
+app_instance_uuid = {ee533ebc-f266-49d1-ae10-d017ee6aa98c}
+NTLMAUTHHANDLER_WORKDIR = /var/cache/ntlmauthhandler
+SAMBA_HOST = 127.0.0.1
+
+[rpcproxy:ldap]
+host = localhost
+port = 389
+basedn = CN=Users,DC=example,DC=com
+set debug = true
+
+[autodiscover]
+
+[autodiscover:rpcproxy]
+enabled = true
+
+[outofoffice]
+
+[outofoffice:file]
+sieve_script_path = /var/vmail/$domain/$user/sieve-script
+sieve_script_path_mkdir = false
+
+[outofoffice:managesieve]
+secret = secret
+
+[loggers]
+keys = root
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s] [%(threadName)s] %(message)s
+----
+
+Once completed, start the OCS Manager service:
+
+ /etc/init.d/openchange-ocsmanager start
 
 Name Service Configuration for Web Services
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~