You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2015/02/16 09:19:26 UTC
bigtop git commit: BIGTOP-1668: puppet: Adjust kerberos module for
current Debian
Repository: bigtop
Updated Branches:
refs/heads/master e2974452f -> 771ca5670
BIGTOP-1668: puppet: Adjust kerberos module for current Debian
On current debian the krb5kdc service is very confined to its standard
directories by systemd settings (writeable paths in systemd unit etc.).
Adjust kerberos module to use those paths so it can work
Signed-off-by: Olaf Flebbe <of...@oflebbe.de>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/771ca567
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/771ca567
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/771ca567
Branch: refs/heads/master
Commit: 771ca5670a4f71bc88b5358f5c258289c49add23
Parents: e297445
Author: Michael Weiser <m....@science-computing.de>
Authored: Thu Feb 12 17:51:03 2015 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Mon Feb 16 09:18:19 2015 +0100
----------------------------------------------------------------------
bigtop-deploy/puppet/modules/kerberos/manifests/init.pp | 8 +++++---
bigtop-deploy/puppet/modules/kerberos/templates/kdc.conf | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/771ca567/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp b/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp
index dd83500..bd5bcca 100644
--- a/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp
@@ -22,14 +22,15 @@ class kerberos {
$keytab_export_dir = "/var/lib/bigtop_keytabs") {
case $operatingsystem {
- 'ubuntu': {
+ 'ubuntu','debian': {
$package_name_kdc = 'krb5-kdc'
$service_name_kdc = 'krb5-kdc'
$package_name_admin = 'krb5-admin-server'
$service_name_admin = 'krb5-admin-server'
$package_name_client = 'krb5-user'
$exec_path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
- $kdc_etc_path = '/etc/krb5kdc/'
+ $kdc_etc_path = '/etc/krb5kdc'
+ $kdc_db_path = '/var/lib/krb5kdc'
}
# default assumes CentOS, Redhat 5 series (just look at how random it all looks :-()
default: {
@@ -39,7 +40,8 @@ class kerberos {
$service_name_admin = 'kadmin'
$package_name_client = 'krb5-workstation'
$exec_path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/kerberos/sbin:/usr/kerberos/bin'
- $kdc_etc_path = '/var/kerberos/krb5kdc/'
+ $kdc_etc_path = '/var/kerberos/krb5kdc'
+ $kdc_db_path = '/var/kerberos/krb5kdc'
}
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/771ca567/bigtop-deploy/puppet/modules/kerberos/templates/kdc.conf
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/kerberos/templates/kdc.conf b/bigtop-deploy/puppet/modules/kerberos/templates/kdc.conf
index 5bc384b..906af60 100644
--- a/bigtop-deploy/puppet/modules/kerberos/templates/kdc.conf
+++ b/bigtop-deploy/puppet/modules/kerberos/templates/kdc.conf
@@ -23,7 +23,7 @@ default_realm = <%= @realm %>
<%= @realm %> = {
kdc_ports = <%= @kdc_port %>
admin_keytab = /etc/kadm5.keytab
- database_name = <%= @kdc_etc_path %>/principal
+ database_name = <%= @kdc_db_path %>/principal
acl_file = <%= @kdc_etc_path %>/kadm5.acl
key_stash_file = <%= @kdc_etc_path %>/stash
max_life = 10h 0m 0s