From bc8f260ed91c5fdb99652497ac59b68b7f882f42 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Tue, 19 Apr 2016 09:00:36 -0700 Subject: [PATCH 1/4] update php5-smbclient status --- .../external_storage/smb.rst | 22 ++++++++----------- .../configuration_server/occ_command.rst | 4 ++-- .../user_auth_ftp_smb_imap.rst | 2 +- .../installation/source_installation.rst | 10 +++------ .../operations/scaling_multiple_machines.rst | 3 +-- admin_manual/release_notes.rst | 18 ++++++++------- 6 files changed, 26 insertions(+), 33 deletions(-) diff --git a/admin_manual/configuration_files/external_storage/smb.rst b/admin_manual/configuration_files/external_storage/smb.rst index f1b11c77d..9d1da80c2 100644 --- a/admin_manual/configuration_files/external_storage/smb.rst +++ b/admin_manual/configuration_files/external_storage/smb.rst @@ -5,8 +5,11 @@ 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`` and + the PHP smbclient module to be installed on the ownCloud server. These + should be included in any Linux distribution. See `PECL smbclient + `_ if your distro does not include + it. You need the following information: @@ -22,19 +25,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..c157654da 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,7 @@ Provides authentication against Samba servers - **Class:** OC_User_SMB - **Arguments:** the samba server to authenticate against -- **Dependency:** `php5-libsmbclient `_ +- **Dependency:** PHP smbclient module - **Example:** :: diff --git a/admin_manual/installation/source_installation.rst b/admin_manual/installation/source_installation.rst index 23974b6fc..ecbc52dbb 100644 --- a/admin_manual/installation/source_installation.rst +++ b/admin_manual/installation/source_installation.rst @@ -80,8 +80,7 @@ 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) * PHP module ftp (for FTP storage / external user authentication) * PHP module imap (for external user authentication) @@ -267,11 +266,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..8f7c359ed 100644 --- a/admin_manual/operations/scaling_multiple_machines.rst +++ b/admin_manual/operations/scaling_multiple_machines.rst @@ -34,8 +34,7 @@ following components were installed on each application server: * PHP-MYSQL * PHP-CURL -Also required is `php5-libsmbclient -`_. +Also required is the PHP smbclient module. 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 -------------- From 7170c987a15485eb10bddeacaf59bc5e22b9fdc3 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Tue, 19 Apr 2016 10:46:15 -0700 Subject: [PATCH 2/4] add links to smb.rst --- admin_manual/configuration_user/user_auth_ftp_smb_imap.rst | 3 ++- admin_manual/installation/source_installation.rst | 3 ++- admin_manual/operations/scaling_multiple_machines.rst | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) 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 c157654da..edad680bb 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:** PHP smbclient module +- **Dependency:** PHP smbclient module (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 ecbc52dbb..f312b2615 100644 --- a/admin_manual/installation/source_installation.rst +++ b/admin_manual/installation/source_installation.rst @@ -80,7 +80,8 @@ Database connectors (pick the one for your database:) Required for specific apps: * PHP module ldap (for LDAP integration) -* PHP module smbclient (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) diff --git a/admin_manual/operations/scaling_multiple_machines.rst b/admin_manual/operations/scaling_multiple_machines.rst index 8f7c359ed..e6bb1152b 100644 --- a/admin_manual/operations/scaling_multiple_machines.rst +++ b/admin_manual/operations/scaling_multiple_machines.rst @@ -34,7 +34,8 @@ following components were installed on each application server: * PHP-MYSQL * PHP-CURL -Also required is the PHP smbclient module. +Also required is the PHP smbclient module (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 From 189c81adb8a33c8a859b5136dc5e1f12fe144ff6 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Tue, 19 Apr 2016 11:00:30 -0700 Subject: [PATCH 3/4] corrections to smbclient requirements --- admin_manual/configuration_files/external_storage/smb.rst | 6 +++--- admin_manual/configuration_user/user_auth_ftp_smb_imap.rst | 2 +- admin_manual/operations/scaling_multiple_machines.rst | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/admin_manual/configuration_files/external_storage/smb.rst b/admin_manual/configuration_files/external_storage/smb.rst index 9d1da80c2..64df0e16d 100644 --- a/admin_manual/configuration_files/external_storage/smb.rst +++ b/admin_manual/configuration_files/external_storage/smb.rst @@ -5,11 +5,11 @@ 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`` and +.. note:: The SMB/CIFS backend requires ``smbclient`` or the PHP smbclient module to be installed on the ownCloud server. These - should be included in any Linux distribution. See `PECL smbclient + should be included in any Linux distribution. (See `PECL smbclient `_ if your distro does not include - it. + them.) You need the following information: 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 edad680bb..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,7 @@ Provides authentication against Samba servers - **Class:** OC_User_SMB - **Arguments:** the samba server to authenticate against -- **Dependency:** PHP smbclient module (see +- **Dependency:** PHP smbclient module or smbclient (see :doc:`../configuration_files/external_storage/smb`) - **Example:** diff --git a/admin_manual/operations/scaling_multiple_machines.rst b/admin_manual/operations/scaling_multiple_machines.rst index e6bb1152b..106a82b19 100644 --- a/admin_manual/operations/scaling_multiple_machines.rst +++ b/admin_manual/operations/scaling_multiple_machines.rst @@ -34,7 +34,7 @@ following components were installed on each application server: * PHP-MYSQL * PHP-CURL -Also required is the PHP smbclient module (see +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 From e4395d33d27dd670c3874a9ef4aef2a002c4a478 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Tue, 19 Apr 2016 12:37:33 -0700 Subject: [PATCH 4/4] prefer php smbclient --- admin_manual/configuration_files/external_storage/smb.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin_manual/configuration_files/external_storage/smb.rst b/admin_manual/configuration_files/external_storage/smb.rst index 64df0e16d..905ac8a2b 100644 --- a/admin_manual/configuration_files/external_storage/smb.rst +++ b/admin_manual/configuration_files/external_storage/smb.rst @@ -6,7 +6,8 @@ ownCloud can connect to Windows file servers or other SMB-compatible servers with the SMB/CIFS backend. .. note:: The SMB/CIFS backend requires ``smbclient`` or - the PHP smbclient module to be installed on the ownCloud server. These + 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.)