diff --git a/admin_manual/configuration_files/external_storage/smb.rst b/admin_manual/configuration_files/external_storage/smb.rst index f1b11c77d..905ac8a2b 100644 --- a/admin_manual/configuration_files/external_storage/smb.rst +++ b/admin_manual/configuration_files/external_storage/smb.rst @@ -5,8 +5,12 @@ SMB/CIFS ownCloud can connect to Windows file servers or other SMB-compatible servers with the SMB/CIFS backend. -.. note:: The SMB/CIFS backend requires ``smbclient`` to be installed on the - ownCloud server. This should be included in any Linux distribution. +.. note:: The SMB/CIFS backend requires ``smbclient`` or + the PHP smbclient module to be installed on the ownCloud server. The PHP + smbclient module is preferred, but either will work. These + should be included in any Linux distribution. (See `PECL smbclient + `_ if your distro does not include + them.) You need the following information: @@ -22,19 +26,12 @@ You need the following information: subfolder name. * And finally, the ownCloud users and groups who get access to the share. -Optionally, you can specify a ``Domain``. This is useful in -cases where the -SMB server requires a domain and a username, and an advanced authentication -mechanism like session credentials is used so that the username cannot be -modified. This is concatenated with the username, so the backend gets +Optionally, you can specify a ``Domain``. This is useful in cases where the SMB +server requires a domain and a username, and an advanced authentication +mechanism like session credentials is used so that the username cannot be +modified. This is concatenated with the username, so the backend gets ``domain\username`` -.. note:: For improved reliability and performance, we recommended installing - ``libsmbclient-php``, a native PHP module for connecting to - SMB servers. It is available as ``php5-libsmbclient`` in the ownCloud - `OBS repositories `_ - .. figure:: images/smb.png :alt: Samba external storage configuration. :scale: 75% diff --git a/admin_manual/configuration_server/occ_command.rst b/admin_manual/configuration_server/occ_command.rst index 46db1206c..ef3228ebd 100644 --- a/admin_manual/configuration_server/occ_command.rst +++ b/admin_manual/configuration_server/occ_command.rst @@ -884,8 +884,8 @@ change to existing files. .. _security_commands_label: -Security --------- +Security (Import SSL Certificates) +---------------------------------- Use these commands to manage server-wide SSL certificates. These are useful when you create federation shares with other ownCloud servers that use self-signed certificates:: diff --git a/admin_manual/configuration_user/user_auth_ftp_smb_imap.rst b/admin_manual/configuration_user/user_auth_ftp_smb_imap.rst index a3b2c67b4..0873dfdc3 100644 --- a/admin_manual/configuration_user/user_auth_ftp_smb_imap.rst +++ b/admin_manual/configuration_user/user_auth_ftp_smb_imap.rst @@ -54,7 +54,8 @@ Provides authentication against Samba servers - **Class:** OC_User_SMB - **Arguments:** the samba server to authenticate against -- **Dependency:** `php5-libsmbclient `_ +- **Dependency:** PHP smbclient module or smbclient (see + :doc:`../configuration_files/external_storage/smb`) - **Example:** :: diff --git a/admin_manual/installation/source_installation.rst b/admin_manual/installation/source_installation.rst index 23974b6fc..f312b2615 100644 --- a/admin_manual/installation/source_installation.rst +++ b/admin_manual/installation/source_installation.rst @@ -80,8 +80,8 @@ Database connectors (pick the one for your database:) Required for specific apps: * PHP module ldap (for LDAP integration) -* `php5-libsmbclient `_ - (SMB/CIFS integration) +* PHP module smbclient (SMB/CIFS integration, see + :doc:`../configuration_files/external_storage/smb`) * PHP module ftp (for FTP storage / external user authentication) * PHP module imap (for external user authentication) @@ -267,11 +267,8 @@ the default site. Open a terminal and run:: a2ensite default-ssl service apache2 reload -.. note:: Self-signed certificates have their drawbacks - especially when you - plan to make your ownCloud server publicly accessible. You might want - to consider getting a certificate signed by a commercial signing - authority. Check with your domain name registrar or hosting service - for good deals on commercial certificates. +.. note:: See :ref:`security_commands_label` for help on managing self-signed + certificates. .. _installation_wizard_label: diff --git a/admin_manual/operations/scaling_multiple_machines.rst b/admin_manual/operations/scaling_multiple_machines.rst index a5ae39159..106a82b19 100644 --- a/admin_manual/operations/scaling_multiple_machines.rst +++ b/admin_manual/operations/scaling_multiple_machines.rst @@ -34,8 +34,8 @@ following components were installed on each application server: * PHP-MYSQL * PHP-CURL -Also required is `php5-libsmbclient -`_. +Also required is the PHP smbclient module or smbclient (see +:doc:`../configuration_files/external_storage/smb`). It is also worth mentioning that the appropriate exceptions where made in the firewall to allow the ownCloud traffic (for the purpose of testing we diff --git a/admin_manual/release_notes.rst b/admin_manual/release_notes.rst index 49e4e5b80..ab01bd1fe 100644 --- a/admin_manual/release_notes.rst +++ b/admin_manual/release_notes.rst @@ -27,15 +27,17 @@ See :doc:`installation/linux_installation`. New option for the ownCloud admin to enable or disable sharing on individual external mountpoints (see :ref:`external_storage_mount_options_label`). Sharing on such mountpoints is disabled by default. -.. Enterprise 9.0 -.. -------------- +Enterprise 9.0 +-------------- -.. owncloud-enterprise packages are no longer available for CentOS6, RHEL6, -.. Debian7, or any version of Fedora. A new package, owncloud-enterprise-files, -.. is available for all supported platforms, including the above. This new -.. package comes without dependencies, and is installable on a larger number of -.. platforms. System administrators must install their own LAMP stacks and -.. databases. See https://owncloud.org/blog/time-to-upgrade-to-owncloud-9-0/ +``owncloud-enterprise`` packages are no longer available for CentOS6, RHEL6, +Debian7, or any version of Fedora. A new package, +``owncloud-enterprise-files``, is available for all supported platforms. This +new package comes without dependencies, and is installable on a larger number of +platforms. System administrators on these older distros must install their own +LAMP stacks and databases. On newer supported distros, install +``owncloud-enterprise`` as usual. See +:doc:`enterprise_installation/linux_installation`. Changes in 8.2 --------------