From 16bb360c8d87defaea62f4a52b2d2d6f3b435411 Mon Sep 17 00:00:00 2001
From: Christian Heimes <cheimes@redhat.com>
Date: Mon, 25 Jun 2018 14:55:48 +0200
Subject: [PATCH] Release v0.6.0

Signed-off-by: Christian Heimes <cheimes@redhat.com>
---
 custodia.spec             |  2 +-
 docs/source/readme.rst    | 30 +++++++++++++++---------------
 src/custodia/__about__.py |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/custodia.spec b/custodia.spec
index 38658f3..0595212 100644
--- a/custodia.spec
+++ b/custodia.spec
@@ -2,7 +2,7 @@
 %global with_python3 1
 %endif
 
-%{!?version: %define version 0.6.dev1}
+%{!?version: %define version 0.6.0}
 
 # FreeIPA up to 4.4.4 are not compatible with custodia because the custodia
 # script now runs under Python 3. FreeIPA 4.4.5 and 4.4.4-2 on F26 are fixed.
diff --git a/docs/source/readme.rst b/docs/source/readme.rst
index a40d450..bd516b0 100644
--- a/docs/source/readme.rst
+++ b/docs/source/readme.rst
@@ -78,21 +78,6 @@ Some APIs are provisional and may change in the future.
 -  The script custodia-cli.
 -  *custodia.ipa* plugins
 
-Optional components
--------------------
-
-Custodia has several optional components with additional dependencies
-
-``gssapi``
-   Negotiate / GSSAPI authentication for Custodia client, also known as
-   Kerberos.
-``ipa``
-   `freeIPA <https://www.freeipa.org/>`_ server plugins.
-
-Optional dependencies can be installed with pip::
-
-    $ pip install custodia[gssapi,ipa]
-
 --------------
 
 custodia.ipa — IPA plugins for Custodia
@@ -224,6 +209,21 @@ Create ``/etc/custodia/ipa.conf``
     handler = Secrets
     store = cert
 
+Create ``/etc/systemd/system/custodia@ipa.service.d/override.conf``
+
+On Fedora 26 and newer, the Custodia service file defaults to Python 3.
+Although FreeIPA 4.5 has support for Python 3, it's not stable yet.
+Therefore it is necessary to run the ``custodia.ipa`` plugins with
+Python 2.7. You can either use ``systemctl edit custodia@py2.service``
+to create an override or copy the file manually. Don't forget to run
+``systemctl daemon-reload`` in the latter case.
+
+::
+
+    [Service]
+    ExecStart=
+    ExecStart=/usr/sbin/custodia-2 --instance=%i /etc/custodia/%i.conf
+
 Run Custodia server
 
 ::
diff --git a/src/custodia/__about__.py b/src/custodia/__about__.py
index 053a812..bef10e2 100644
--- a/src/custodia/__about__.py
+++ b/src/custodia/__about__.py
@@ -9,7 +9,7 @@
 __summary__ = 'A service to manage, retrieve and store secrets.'
 __uri__ = 'https://github.com/latchset/custodia'
 
-__version_info__ = (0, 6, 'dev1')
+__version_info__ = (0, 6, 0)
 __version__ = '.'.join(str(v) for v in __version_info__)
 
 __author__ = 'Custodia project Contributors'