[Ovirt-devel] [PATCH recipe] More hatch battening

[Ian Main]

Also add these files to the recipe for now so it continues to work.

Signed-off-by: Ian Main <imain at redhat.com>
---
 appliances/ovirt/files/qpidd.conf       |    7 +------
 appliances/ovirt/files/sasl2_qpidd.conf |    5 ++---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/appliances/ovirt/files/qpidd.conf b/appliances/ovirt/files/qpidd.conf
index bf80918..4480460 100644
--- a/appliances/ovirt/files/qpidd.conf
+++ b/appliances/ovirt/files/qpidd.conf
@@ -2,10 +2,5 @@
 #  name = value
 # Using default settings: "qpidd --help" or "man qpidd" for more details.
 
-
-# This is where we want to be, but we can't actually do that yet because
-# we have unencrypted db-omatic and taskomatic running over localhost.
-# This will change shortly once we have gssapi support for ruby.
-#
-#require-encryption
+require-encryption
 
diff --git a/appliances/ovirt/files/sasl2_qpidd.conf b/appliances/ovirt/files/sasl2_qpidd.conf
index c61131f..e5c4143 100644
--- a/appliances/ovirt/files/sasl2_qpidd.conf
+++ b/appliances/ovirt/files/sasl2_qpidd.conf
@@ -40,8 +40,7 @@ pwcheck_method: auxprop
 auxprop_plugin: sasldb
 sasldb_path: /var/lib/qpidd/qpidd.sasldb
 
-# For now we allow plain auth too because the local daemons do not yet
-# support kerberos.
-mech_list: gssapi plain
+# Only allow GSSAPI
+mech_list: gssapi
 keytab: /usr/share/ovirt-server/ovirt.keytab
 
-- 
1.6.0.4