Merge lp:~hrvojem/percona-xtradb-cluster/new_encrypt_doc into lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5

[Hrvoje Matijakovic]

=== modified file 'doc-pxc/source/manual/xtrabackup_sst.rst'
--- doc-pxc/source/manual/xtrabackup_sst.rst	2013-10-18 17:32:02 +0000
+++ doc-pxc/source/manual/xtrabackup_sst.rst	2013-11-04 12:44:31 +0000
@@ -9,9 +9,11 @@
  * Stage I on joiner checks if it is |SST| or |IST| based on presence of :file:`xtrabackup_ist` file. 
  * In Stage II it starts the data transfer, if it's |SST|, it empties the data directory sans few files (galera.cache, sst_in_progress, grastate.dat) and then proceed with the SST or if it's IST, proceeds as before.
 
-This change has introduced **incompatibilities** with older versions, refer to `Incompatibilities <http://www.percona.com/doc/percona-xtradb-cluster/errata.html#incompatibilities>`_ for more details.
-
-Latest Xtrabackup 2.1.x is strongly recommended for Xtrabackup SST.
+.. warning::
+
+   :ref:`xtrabackup_sst` implementation added in |Percona XtraDB Cluster| :rn:`5.5.33-23.7.6` has been renamed to ``xtrabackup-v2``, so :variable:`wsrep_sst_method` =xtrabackup will use xtrabackup implementation before :rn:`5.5.33-23.7.6` and will be compatible with older |Percona XtraDB Cluster| versions. In order to use the new version :variable:`wsrep_sst_method` should be set to ``xtrabackup-v2``.
+
+Latest |Percona Xtrabackup| 2.1.x is strongly recommended for Xtrabackup SST. Refer to `Incompatibilities <http://www.percona.com/doc/percona-xtradb-cluster/errata.html#incompatibilities>`_ for possible caveats.
 
 Following SST specific options are allowed in my.cnf under [sst]                                     
 -----------------------------------------------------------------
@@ -60,7 +62,7 @@
                                                                                                              
 .. option:: encrypt
 
-    :Values: 0,1,2  
+    :Values: 0,1,2,3
     :Default: 0
     :Match: Yes
 
@@ -73,6 +75,8 @@
 
   * OpenSSL based encryption with ``encrypt=2``. Socat must be built with openSSL for encryption: ``socat -V | grep OPENSSL``.
 
+  * Support for SSL encryption for just the key and crt files as implemented in `Galera <http://www.codership.com/wiki/doku.php?id=ssl_support>`_ can be enabled with ``encrypt=3`` option. Information on this option can be found :ref:`here <galera_sst_encryption>`.
+
 Refer to this :ref:`document <xtrabackup_sst_encryption>` when enabling with ``encrypt=1``.
 
 .. option:: encrypt-algo
@@ -138,6 +142,15 @@
 
 If set to 1, SST will use the thread pool's `extra_port <http://www.percona.com/doc/percona-server/5.6/performance/threadpool.html#extra_port>`_. Make sure that thread pool is enabled and extra_port option is set in my.cnf before you turn on this option.
 
+.. option:: cpat
+
+During the SST, the :term:`datadir` is cleaned up so that state of other node can be restored cleanly. This option provides the ability to define the files that need to be deleted before the SST. It can be set like: :: 
+
+  [sst]
+  cpat='.*galera\.cache$\|.*sst_in_progress$\|.*grastate\.dat$\|.*\.err$\|.*\.log$\|.*RPM_UPGRADE_MARKER$\|.*RPM_UPGRADE_HISTORY$\|.*\.xyz$'
+
+**NOTE:** This option can only be used when :variable:`wsrep_sst_method` is set to xtrabackup-v2.
+
 .. _tar_ag_xbstream:
 
 Tar against xbstream
@@ -158,6 +171,20 @@
     * mkfifo. Required for :option:`progress`. Provided by coreutils.
     * mktemp. Required for :option:`incremental`. Provided by coreutils.
 
+.. _galera_sst_encryption:
+
+Galera compatible encryption
+----------------------------
+
+Support for SSL encryption for just the key and crt files as implemented in `Galera <http://www.codership.com/wiki/doku.php?id=ssl_support>`_ can be enabled with ``encrypt=3`` option. This has been implemented in :rn:`5.5.34-23.7.6` for compatibility with Galera. **NOTE**: This option does not provide certificate validation. In order to work correctly paths to the key and cert files need to be specified as well, like: ::
+
+   [sst] 
+   encrypt=3
+   tkey=/etc/mysql/key.pem
+   tcert=/etc/mysql/cert.pem
+
+**NOTE:** This option can only be used when :variable:`wsrep_sst_method` is set to xtrabackup-v2.
+
 .. _xtrabackup_sst_encryption:
 
 Xtrabackup-based encryption

=== modified file 'doc-pxc/source/release-notes/Percona-XtraDB-Cluster-5.5.34-23.7.6.rst'
--- doc-pxc/source/release-notes/Percona-XtraDB-Cluster-5.5.34-23.7.6.rst	2013-11-04 10:19:08 +0000
+++ doc-pxc/source/release-notes/Percona-XtraDB-Cluster-5.5.34-23.7.6.rst	2013-11-04 12:44:31 +0000
@@ -51,7 +51,9 @@
 
 :ref:`xtrabackup_sst` implementation added in |Percona XtraDB Cluster| :rn:`5.5.33-23.7.6` has been renamed xtrabackup-v2, so :variable:`wsrep_sst_method` =xtrabackup will use xtrabackup implementation before :rn:`5.5.33-23.7.6` and will be compatible with older |Percona XtraDB Cluster| versions. Bug fixed :bug:`1228618`.
 
-Other bugs fixed: bug fixed :bug:`1244741`, bug fixed :bug:`1244667`, bug fixed :bug:`1243150`, bug fixed :bug:`1232890`, bug fixed :bug:`1235244`, bug fixed :bug:`999492`, bug fixed :bug:`1245769`, bug fixed :bug:`1244100`.
+Support for SSL encryption for just the key and crt files as implemented in `Galera <http://www.codership.com/wiki/doku.php?id=ssl_support>`_ can be enabled with ``encrypt=3`` option. This has been implemented in :rn:`5.5.34-23.7.6` for compatibility with Galera. Bug fixed :bug:`1235244`.
+
+Other bugs fixed: bug fixed :bug:`1244741`, bug fixed :bug:`1244667`, bug fixed :bug:`1243150`, bug fixed :bug:`1232890`, bug fixed :bug:`999492`, bug fixed :bug:`1245769`, bug fixed :bug:`1244100`.
  
 Based on `Percona Server 5.5.34-32.0 <http://www.percona.com/doc/percona-server/5.5/release-notes/Percona-Server-5.5.34-32.0.html>`_ including all the bug fixes in it, `Galera Replicator <https://launchpad.net/galera/+milestone/23.2.7>`_ and on `Codership wsrep API 5.5.34-25.9 <https://launchpad.net/codership-mysql/+milestone/5.5.34-25.9>`_, |Percona XtraDB Cluster| `5.5.34-23.7.6 <https://launchpad.net/percona-xtradb-cluster/+milestone/5.5.34-23.7.6>`_ is now the current stable release. All of |Percona|'s software is open-source and free.