Merge branch 'master' into v7

NethServer · May 12, 2017 · 7b94995 · 7b94995
2 parents 0037659 + 6724534
commit 7b94995
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 26 deletions.
diff --git a/developer-manual/en/index.rst b/developer-manual/en/index.rst
@@ -36,7 +36,6 @@ Developer Manual
    filesystem_options
    dns
    dhcp
-   logs
    random_url
    migration
    certificate_management

diff --git a/developer-manual/en/logs.rst b/developer-manual/en/logs.rst
diff --git a/developer-manual/en/nethserver-base.rst b/developer-manual/en/nethserver-base.rst
@@ -259,3 +259,28 @@ DB example: ::
     PassWarning=7
     Users=none
 
+Log retention and rotation
+==========================
+
+By default logs are rotated weekly and kept for 4 weeks.
+Some packages come with different defaults, but the majority do not specify a custom rotate value.
+
+Logrotate db property:
+
+* ``Rotate``: rotation frequency, can be  ``daily``, ``weekly``, ``monthly``. Default is ``weekly``
+* ``Times``: rotate log files ``Times`` number of times (days, weeks or months) before being removes, default is 4
+* ``Compression``: can be ``enabled`` or ``disabled``. Defaults is ``disabled``
+
+Example: ::
+
+  logrotate=configuration
+    Compression=disabled
+    Rotate=weekly
+    Times=4
+
+Keep logs for 6 months, rotate once a week: ::
+
+  config setprop logrotate Rotate weekly
+  config setprop logrotate Times 24
+  signal-event nethserver-base-update
+
diff --git a/developer-manual/en/nethserver-nextcloud.rst b/developer-manual/en/nethserver-nextcloud.rst
@@ -44,3 +44,11 @@ The Nextcloud backup includes the configuration file and all data of the users:
 
 The database is automatically saved by ``nethserver-mysql``.
 
+OCC
+===
+
+When using ``occ`` command, PHP 5.6 should be enabled inside the environment.
+
+Invocation example: ::
+
+  su - apache -s /bin/bash -c "source /opt/rh/rh-php56/enable; cd /usr/share/nextcloud/; php occ " ldap:show-config
diff --git a/developer-manual/en/nethserver-webtop5.rst b/developer-manual/en/nethserver-webtop5.rst
@@ -29,6 +29,7 @@ Available properties:
 
 * ``ActiveSync``: if set to ``enabled``, it enables /Microsoft-Server-ActiveSync url.  Default is ``enabled``
 * ``ActiveSyncLog``: log level of z-push implementation. As default z-push will log only relevant errors.
+* ``Debug``: if set to ``true``, enable debug for the web application. Default is ``false``
 * ``DefaultLocale``: default locale for WebTop users. To list available locales execute: ``/etc/e-smith/events/actions/nethserver-webtop5-locale-tz``
 * ``DefaultTimezone``: default timezone for WebTop users. To list available timezones: ``JAVA_HOME=/usr/share/webtop/ java ListTimeZones``
 * ``MinMemory`` and ``MaxMemory``: minimun and maximum memory of Tomcat instance. Values are expressed in MB.
@@ -39,6 +40,7 @@ Example: ::
   webtop=configuration
       ActiveSync=enabled
       ActiveSyncLog=LOGLEVEL_ERROR
+      Debug=false
       DefaultLocale=en_US
       DefaultTimezone=Etc/UTC
       MaxMemory=1024