Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Control: blocks -1 by 769471
TL;DR: documentation only update, in sync with #769471.
Please unblock package owncloud-doc
This is just a documentation update, in sync with owncloud as proposed
in #769471.
In order to actually build the ownCloud document from source, as
provided via its webui, the Debian maintainers are providing it via a
separate package.
The attached debdiff is filtered using the following command, since the
developer manual is not actually built nor shipped in the binary Debian
package:
debdiff --ignore-space ../owncloud-doc_0~20141{022,107}-1.dsc | \
filterdiff -x '*/developer_manual/*'
The changes are not too big:
10 files changed, 126 insertions(+), 65 deletions(-)
and as showed in the binary debdiff in P.-S., one page is added and
another one removed, as expected and documented in the changelog.
There is no change in the (debian/) packaging besides the changelog that
tries to document the actual upstream changes:
owncloud-doc (0~20141107-1) unstable; urgency=medium
[ leron49 ]
* Delete import/export documentation
-- David Prévot <taffit@debian.org> Tue, 11 Nov 2014 10:10:39 -0400
owncloud-doc (0~20141106-1) unstable; urgency=medium
* Upload to unstable in sync with 7.0.3~rc3
[ Morris Jobke ]
* update config.sample.php generated documentation
[ joaoepj ]
* Update auth_ldap.rst
-- David Prévot <taffit@debian.org> Thu, 06 Nov 2014 16:54:19 -0400
owncloud-doc (0~20141029-1) experimental; urgency=medium
* Upload to experimental not to prevent the migration of the previous
version into testing
[ menelic ]
* Create installing_apps.rst
[ Dieter Verfaillie ]
* Fix output redirection in command example
-- David Prévot <taffit@debian.org> Thu, 30 Oct 2014 14:40:35 -0400
unblock owncloud-doc/0~20141107-1
Thanks in advance.
Regards
David
P.-S.: $ debdiff --ignore-space
../owncloud-doc_0~20141{022,107}-1_amd64.changes
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .changes but not in first
-----------------------------------------
-rw-r--r-- root/root /usr/share/owncloud/core/doc/user/_sources/installing_apps.txt
-rw-r--r-- root/root /usr/share/owncloud/core/doc/user/installing_apps.html
Files in first .changes but not in second
-----------------------------------------
-rw-r--r-- root/root /usr/share/owncloud/core/doc/user/_sources/migration.txt
-rw-r--r-- root/root /usr/share/owncloud/core/doc/user/migration.html
Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-10078-] {+10075+}
Version: [-0~20141022-1-] {+0~20141107-1+}
-- System Information:
Debian Release: jessie/sid
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500, 'unstable'), (500, 'testing'), (500, 'stable'), (100, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.17-1-amd64 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru -w owncloud-doc-0~20141022/admin_manual/configuration/auth_ldap.rst owncloud-doc-0~20141107/admin_manual/configuration/auth_ldap.rst
--- owncloud-doc-0~20141022/admin_manual/configuration/auth_ldap.rst 2014-10-23 14:01:24.000000000 -0400
+++ owncloud-doc-0~20141107/admin_manual/configuration/auth_ldap.rst 2014-11-11 10:06:26.000000000 -0400
@@ -477,7 +477,7 @@
ownCloud support user profile pictures, which are also called avatars. If a user
has a photo stored in the *jpegPhoto* or *thumbnailPhoto* attribute on your LDAP
-server, it will be used as their avatar. In this case the user cannot their
+server, it will be used as their avatar. In this case the user cannot alter their
avatar (on their Personal page) as it must be changed in LDAP. *jpegPhoto* is
preferred over *thumbnailPhoto*.
@@ -511,7 +511,7 @@
*/etc/ldap/ldap.conf* on Linux, *C:\\openldap\\sysconf\\ldap.conf* or
*C:\\ldap.conf* on Windows) using a **TLS_CACERT /path/to/cert** line.
* Using LDAPS, also make sure that the port is correctly configured (by default
- 686)
+ 636)
Microsoft Active Directory
--------------------------
diff -Nru -w owncloud-doc-0~20141022/admin_manual/configuration/background_jobs.rst owncloud-doc-0~20141107/admin_manual/configuration/background_jobs.rst
--- owncloud-doc-0~20141022/admin_manual/configuration/background_jobs.rst 2014-10-23 14:01:24.000000000 -0400
+++ owncloud-doc-0~20141107/admin_manual/configuration/background_jobs.rst 2014-11-11 10:06:26.000000000 -0400
@@ -43,7 +43,7 @@
To run a cron job on a \*nix system, every 15 minutes, under the default web server user (often, ``www-data`` or ``wwwrun``), you must set up the following cron job to call the **cron.php** script::
# crontab -u www-data -e
- */15 * * * * php -f /var/www/owncloud/cron.php /dev/null 2>&1
+ */15 * * * * php -f /var/www/owncloud/cron.php > /dev/null 2>&1
You can verify if the cron job has been added and scheduled by executing::
diff -Nru -w owncloud-doc-0~20141022/admin_manual/configuration/configuration_config_sample_php.rst owncloud-doc-0~20141107/admin_manual/configuration/configuration_config_sample_php.rst
--- owncloud-doc-0~20141022/admin_manual/configuration/configuration_config_sample_php.rst 2014-10-23 14:01:24.000000000 -0400
+++ owncloud-doc-0~20141107/admin_manual/configuration/configuration_config_sample_php.rst 2014-11-11 10:06:26.000000000 -0400
@@ -111,6 +111,15 @@
::
+ 'dbdriveroptions' => array(
+ PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
+ ),
+
+Additional driver options for the database connection, eg. to enable SSL
+encryption in MySQL.
+
+::
+
'installed' => false,
Indicates whether the ownCloud instance was installed successfully; ``true``
@@ -418,10 +427,10 @@
'overwrite.cli.url' => '',
-Use this configuration parameter to specify the base url for any urls which are
-generated within ownCloud using any kind of command line tools (cron or occ).
-
-The value should contain the full base URL: ``https://www.example.com/owncloud``
+Use this configuration parameter to specify the base url for any urls which
+are generated within ownCloud using any kind of command line tools (cron or
+occ). The value should contain the full base URL:
+``https://www.example.com/owncloud``
::
@@ -447,8 +456,8 @@
'trashbin_retention_obligation' => 30,
-When the trash bin app is enabled (default), this is the number of days a file
-will be kept in the trash bin. Default is 30 days.
+When the trash bin app is enabled (default), this is the number of days a
+file will be kept in the trash bin. Default is 30 days.
::
@@ -929,6 +938,25 @@
::
+ 'supportedDatabases' => array(
+ 'sqlite',
+ 'mysql',
+ 'pgsql',
+ 'oci',
+ 'mssql'
+ ),
+
+Database types that are supported for installation.
+
+Available:
+ - sqlite (SQLite3)
+ - mysql (MySQL)
+ - pgsql (PostgreSQL)
+ - oci (Oracle)
+ - mssql (Microsoft SQL Server)
+
+::
+
'custom_csp_policy' =>
"default-src 'self'; script-src 'self' 'unsafe-eval'; ".
"style-src 'self' 'unsafe-inline'; frame-src *; img-src *; ".
diff -Nru -w owncloud-doc-0~20141022/admin_manual/installation/installation_source.rst owncloud-doc-0~20141107/admin_manual/installation/installation_source.rst
--- owncloud-doc-0~20141022/admin_manual/installation/installation_source.rst 2014-10-23 14:01:24.000000000 -0400
+++ owncloud-doc-0~20141107/admin_manual/installation/installation_source.rst 2014-11-11 10:06:26.000000000 -0400
@@ -147,17 +147,16 @@
document root of your Web server. Typically, on Ubuntu systems this
``/var/www/owncloud``, so your copying command is::
- cp -r owncloud /var/www/`
+ cp -r owncloud /var/www/
-Set the Directory Permissions
------------------------------
+Setting Secure Directory Permissions
+------------------------------------
Your HTTP user must own at least the ``config/``, ``data/``
and ``apps/`` directories in your ownCloud directory so that you can
configure ownCloud, create, modify and delete your data files, and install apps
-via the ownCloud Web interface. If you are planning to use the automatic
-updater app for updating ownCloud, the whole ``owncloud/`` directory must be
-writable by the HTTP user.
+via the ownCloud Web interface. We recommend setting the directory
+permissions as strictly as possible for stronger security.
You can find your HTTP user in your HTTP server configuration files. Or you can
create a PHP page to find it for you. To do this, create a plain text file with
@@ -166,7 +165,7 @@
``<?php echo exec('whoami'); ?>``
Name it ``whoami.php`` and place it in your ``/var/www/html`` directory, and
-then open it in a Web browser, for example ``http://servername/whoami.php``. You
+then open it in a Web browser, for example ``http://localhost/whoami.php``. You
should see a single line in your browser page with the HTTP user name.
.. note:: When using an NFS mount for the data directory, do not change
@@ -175,11 +174,23 @@
ownership as above could result in some issues if the NFS mount is
lost.
-* The generic command to change ownership of all files and subdirectories in a
+The generic command to change ownership of all files and subdirectories in a
directory is::
chown -R <http-user>:<http-user> /path/to/owncloud/
+For hardened security we highly recommend setting the permissions on your ownCloud directory as strictly
+as possible. These commands should be executed immediately after the initial installation::
+
+ chown -R root:root /path/to/owncloud/
+ chown <http-user>:<http-user> /path/to/owncloud/config/config.php
+ chown -R <http-user>:<http-user> /path/to/owncloud/data/
+ chown root:root /path/to/owncloud/data/.htaccess
+ chown <http-user>:<http-user> /path/to/owncloud/apps/
+
+These strict permissions will prevent the Updater app from working. If you use the Updater app, it needs your whole
+ownCloud directory to be owned by the http-user, like these examples:
+
* This example is for Ubuntu 14.04 LTS server::
chown -R www-data:www-data /var/www/owncloud
@@ -196,6 +207,8 @@
chown -R wwwrun:www /path/to/owncloud/
+After the Update app has run, you should re-apply the strict permissions.
+
Apache is the recommended Web server.
Apache Web Server Configuration
diff -Nru -w owncloud-doc-0~20141022/debian/changelog owncloud-doc-0~20141107/debian/changelog
--- owncloud-doc-0~20141022/debian/changelog 2014-10-23 14:03:24.000000000 -0400
+++ owncloud-doc-0~20141107/debian/changelog 2014-11-11 10:11:33.000000000 -0400
@@ -1,3 +1,35 @@
+owncloud-doc (0~20141107-1) unstable; urgency=medium
+
+ [ leron49 ]
+ * Delete import/export documentation
+
+ -- David Prévot <taffit@debian.org> Tue, 11 Nov 2014 10:10:39 -0400
+
+owncloud-doc (0~20141106-1) unstable; urgency=medium
+
+ * Upload to unstable in sync with 7.0.3~rc3
+
+ [ Morris Jobke ]
+ * update config.sample.php generated documentation
+
+ [ joaoepj ]
+ * Update auth_ldap.rst
+
+ -- David Prévot <taffit@debian.org> Thu, 06 Nov 2014 16:54:19 -0400
+
+owncloud-doc (0~20141029-1) experimental; urgency=medium
+
+ * Upload to experimental not to prevent the migration of the previous
+ version into testing
+
+ [ menelic ]
+ * Create installing_apps.rst
+
+ [ Dieter Verfaillie ]
+ * Fix output redirection in command example
+
+ -- David Prévot <taffit@debian.org> Thu, 30 Oct 2014 14:40:35 -0400
+
owncloud-doc (0~20141022-1) unstable; urgency=medium
[ Morris Jobke ]
diff -Nru -w owncloud-doc-0~20141022/developer_manual/android_library/examples.rst owncloud-doc-0~20141107/developer_manual/android_library/examples.rst
diff -Nru -w owncloud-doc-0~20141022/developer_manual/android_library/index.rst owncloud-doc-0~20141107/developer_manual/android_library/index.rst
diff -Nru -w owncloud-doc-0~20141022/developer_manual/android_library/library_installation.rst owncloud-doc-0~20141107/developer_manual/android_library/library_installation.rst
diff -Nru -w owncloud-doc-0~20141022/developer_manual/app/js.rst owncloud-doc-0~20141107/developer_manual/app/js.rst
diff -Nru -w owncloud-doc-0~20141022/developer_manual/app/l10n.rst owncloud-doc-0~20141107/developer_manual/app/l10n.rst
diff -Nru -w owncloud-doc-0~20141022/developer_manual/app/request.rst owncloud-doc-0~20141107/developer_manual/app/request.rst
diff -Nru -w owncloud-doc-0~20141022/developer_manual/ios_library/examples.rst owncloud-doc-0~20141107/developer_manual/ios_library/examples.rst
Les fichiers binaires /tmp/u1WPTkszFO/owncloud-doc-0~20141022/developer_manual/ios_library/images/100000000000030C000001E61DFDBF76.png et /tmp/JjZ72PgPYb/owncloud-doc-0~20141107/developer_manual/ios_library/images/100000000000030C000001E61DFDBF76.png sont différents
Les fichiers binaires /tmp/u1WPTkszFO/owncloud-doc-0~20141022/developer_manual/ios_library/images/100000000000030C000001E637605044.png et /tmp/JjZ72PgPYb/owncloud-doc-0~20141107/developer_manual/ios_library/images/100000000000030C000001E637605044.png sont différents
Les fichiers binaires /tmp/u1WPTkszFO/owncloud-doc-0~20141022/developer_manual/ios_library/images/100000000000030C000001E7A7A01884.png et /tmp/JjZ72PgPYb/owncloud-doc-0~20141107/developer_manual/ios_library/images/100000000000030C000001E7A7A01884.png sont différents
Les fichiers binaires /tmp/u1WPTkszFO/owncloud-doc-0~20141022/developer_manual/ios_library/images/100000000000030C000001E8AB4C3306.png et /tmp/JjZ72PgPYb/owncloud-doc-0~20141107/developer_manual/ios_library/images/100000000000030C000001E8AB4C3306.png sont différents
Les fichiers binaires /tmp/u1WPTkszFO/owncloud-doc-0~20141022/developer_manual/ios_library/images/100000000000030C000001ECB85120C2.png et /tmp/JjZ72PgPYb/owncloud-doc-0~20141107/developer_manual/ios_library/images/100000000000030C000001ECB85120C2.png sont différents
Les fichiers binaires /tmp/u1WPTkszFO/owncloud-doc-0~20141022/developer_manual/ios_library/images/10000201000003B9000002B619E44B0C.png et /tmp/JjZ72PgPYb/owncloud-doc-0~20141107/developer_manual/ios_library/images/10000201000003B9000002B619E44B0C.png sont différents
Les fichiers binaires /tmp/u1WPTkszFO/owncloud-doc-0~20141022/developer_manual/ios_library/images/10000201000003B9000002B66AC4279B.png et /tmp/JjZ72PgPYb/owncloud-doc-0~20141107/developer_manual/ios_library/images/10000201000003B9000002B66AC4279B.png sont différents
Les fichiers binaires /tmp/u1WPTkszFO/owncloud-doc-0~20141022/developer_manual/ios_library/images/10000201000003B9000002B68F027979.png et /tmp/JjZ72PgPYb/owncloud-doc-0~20141107/developer_manual/ios_library/images/10000201000003B9000002B68F027979.png sont différents
Les fichiers binaires /tmp/u1WPTkszFO/owncloud-doc-0~20141022/developer_manual/ios_library/images/10000201000003B9000002B69A5110D2.png et /tmp/JjZ72PgPYb/owncloud-doc-0~20141107/developer_manual/ios_library/images/10000201000003B9000002B69A5110D2.png sont différents
Les fichiers binaires /tmp/u1WPTkszFO/owncloud-doc-0~20141022/developer_manual/ios_library/images/100002010000046D000002B55ECA38D5.png et /tmp/JjZ72PgPYb/owncloud-doc-0~20141107/developer_manual/ios_library/images/100002010000046D000002B55ECA38D5.png sont différents
diff -Nru -w owncloud-doc-0~20141022/developer_manual/ios_library/index.rst owncloud-doc-0~20141107/developer_manual/ios_library/index.rst
diff -Nru -w owncloud-doc-0~20141022/developer_manual/ios_library/library_installation.rst owncloud-doc-0~20141107/developer_manual/ios_library/library_installation.rst
diff -Nru -w owncloud-doc-0~20141022/user_manual/contents.rst owncloud-doc-0~20141107/user_manual/contents.rst
--- owncloud-doc-0~20141022/user_manual/contents.rst 2014-10-23 14:01:24.000000000 -0400
+++ owncloud-doc-0~20141107/user_manual/contents.rst 2014-11-11 10:06:26.000000000 -0400
@@ -1,8 +1,8 @@
.. _contents:
-===============================
-ownCloud documentation contents
-===============================
+====================
+ownCloud User Manual
+====================
.. toctree::
:hidden:
@@ -24,7 +24,7 @@
-Indices and tables
-==================
+.. Indices and tables
+.. ==================
-* :ref:`genindex`
+.. * :ref:`genindex`
diff -Nru -w owncloud-doc-0~20141022/user_manual/files/quota.rst owncloud-doc-0~20141107/user_manual/files/quota.rst
--- owncloud-doc-0~20141022/user_manual/files/quota.rst 2014-10-23 14:01:24.000000000 -0400
+++ owncloud-doc-0~20141107/user_manual/files/quota.rst 2014-11-11 10:06:26.000000000 -0400
@@ -1,6 +1,5 @@
Storage Quota
=============
-
Your ownCloud admin has the option to set a storage quota on users. Look at
the top of your Personal page to see what your quota is, and how much you have
used.
diff -Nru -w owncloud-doc-0~20141022/user_manual/index.rst owncloud-doc-0~20141107/user_manual/index.rst
--- owncloud-doc-0~20141022/user_manual/index.rst 2014-10-23 14:01:24.000000000 -0400
+++ owncloud-doc-0~20141107/user_manual/index.rst 2014-11-11 10:06:26.000000000 -0400
@@ -37,25 +37,21 @@
File Access and Management
==========================
The following topics contain information about file access and management.
-Access information includes how to access your server using the ownCloud web
-interface or through the use of WebDAV shares (Linux or Mac OSX) or web folders
-(Windows):
-* :doc:`files/filesweb`
-* :doc:`files/files`
-* :doc:`files/sync`
-* :doc:`files/server_to_server_using`
-* :doc:`files/versioncontrol`
+* :doc:`files/configuring_big_file_upload`
* :doc:`files/deletedfiles`
* :doc:`files/encryption`
+* :doc:`files/files`
+* :doc:`files/filesweb`
* :doc:`files/quota`
-* :doc:`files/configuring_big_file_upload`
-
+* :doc:`files/server_to_server_using`
+* :doc:`files/sync`
+* :doc:`files/versioncontrol`
Contacts and Calendar
=====================
-The following topic provides information about the **Contacts** and
-**Calendar** applications including usage instructions as well as how to
+The following topics provide information about the **Contacts** and
+**Calendar** applications, including usage instructions as well as how to
export, import, and synchronization the ownCloud calendar application with
different operating system calendars:
@@ -80,13 +76,6 @@
* :doc:`bookmarks`
-Backup
-======
-The following topic describes the ownCloud **User_Migrate** application used to
-import and export user account settings:
-
-* :doc:`migration`
-
External storage
================
Please see ``Configuring External Storage (GUI)`` in the ownCloud
@@ -96,7 +85,7 @@
<http://doc.owncloud.org/server/7.0/admin_manual/configuration/
custom_mount_config_gui.html>`_
-Indices and tables
-==================
+.. Indices and tables
+.. ==================
-* :ref:`genindex`
+.. * :ref:`genindex`
diff -Nru -w owncloud-doc-0~20141022/user_manual/installing_apps.rst owncloud-doc-0~20141107/user_manual/installing_apps.rst
--- owncloud-doc-0~20141022/user_manual/installing_apps.rst 1969-12-31 20:00:00.000000000 -0400
+++ owncloud-doc-0~20141107/user_manual/installing_apps.rst 2014-11-11 10:06:26.000000000 -0400
@@ -0,0 +1,19 @@
+# Installing Apps in ownCloud
+
+ownCloud functionality can be enhanced by installing apps that run in the server instance and provide additional features such as a music player and server, single file encryption, an RSS aggregator and many more. An app repository can be found at apps.owncloud.com, where apps are listed, ranked, discussed and offered for download. A small subsection of these apps can be downloaded and installed directly from the Apps menu inside ownCloud. The majority of these apps however needs to be installed manually by downloading the zipped app from the app repository, uploading and unpacking it inside the ownCloud server instance. Provided app and ownCloud version are compatible, a refresh of the app section will then show this app in the list of installable apps in a column at the left of the ownCloud web interface.
+
+# Security notice
+
+Only apps listed as installable form within ownCloud have undergone extensive security checks. All other apps are installed at the users' own risk. Manually added apps are parsed by a code checker, apps found to request questionable permissions are blocked from being installed. At the moment, there is no user facing message about this - the app just does not appear in the list of available apps.
+
+# Troubleshooting
+
+If a manual app install fails, this could be due to the fact that
+
++you have downloaded a version incompatible with the ownCloud version in use
+
++the app has been rejected by the internal app code checker
+
++there is a genuine bug in the app that prevents it from running.
+
+Please refer to the comment section in apps.owncloud.com to check if others have raised similar problems. Note that the score and download numbers of an app are a helpful, but not a sufficient measure of the quality and security of an app.
diff -Nru -w owncloud-doc-0~20141022/user_manual/migration.rst owncloud-doc-0~20141107/user_manual/migration.rst
--- owncloud-doc-0~20141022/user_manual/migration.rst 2014-10-23 14:01:24.000000000 -0400
+++ owncloud-doc-0~20141107/user_manual/migration.rst 1969-12-31 20:00:00.000000000 -0400
@@ -1,19 +0,0 @@
-User Account Migration
-======================
-
-User account migration support is provided by the user_migrate app. It is important to note that only data from apps that support migration will be migrated. While we encourage all apps to support migration, it is not a requirement and it the responsibility of the app developer.
-
-Export
-------
-To export your user account, simply visit Settings > Personal and click on the 'Export' button. A compressed zip file will be generated on the fly and downloaded to your computer. This file includes all of your files and application data that was stored on your ownCloud account. You may use this as a method of backing up your personal account.
-
-Import
-------
-To import your user account, you must first have an existing account on your new ownCloud install. Then follow this procedure:
-
-#. Login to your new account on the new ownCloud instance
-#. Navigate to the Settings > Personal page
-#. Select the 'Import' button, and locate the zip file that you downloaded from your old ownCloud instance
-#. Wait for the file to be uploaded and imported
-
-.. note:: Your user account credentials will **not** be migrated.
Attachment:
signature.asc
Description: Digital signature