Skip to content

Remove comment 'server string' #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
serdar6684 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Remove comment 'server string' #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c223c2
Remove comment 'server string'
Jun 13, 2018
da8bc9a
KRB5 Add values in section realms
Jun 14, 2018
20120ef
adaptation module for DE
Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 52 additions & 74 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,53 +16,58 @@
# }
class winbind::config (
# lint:ignore:80chars
$krb5_admin_server = $::winbind::krb5_admin_server,
$krb5_default = $::winbind::krb5_default,
$krb5_dns_lookup_kdc = $::winbind::krb5_dns_lookup_kdc,
$krb5_dns_lookup_realm = $::winbind::krb5_dns_lookup_realm,
$krb5_forwardable = $::winbind::krb5_forwardable,
$krb5_kdc = $::winbind::krb5_kdc,
$krb5_renew_lifetime = $::winbind::krb5_renew_lifetime,
$krb5_ticket_lifetime = $::winbind::krb5_ticket_lifetime,
$manage_joindomain_script = $::winbind::manage_joindomain_script,
$manage_oddjob_service = $::winbind::manage_oddjob_service,
$oddjobd_homdir_mask = $::winbind::oddjobd_homdir_mask,
$pam_cached_login = $::winbind::pam_cached_login,
$pam_debug_state = $::winbind::pam_debug_state,
$pam_debug = $::winbind::pam_debug,
$pam_krb5_auth = $::winbind::pam_krb5_auth,
$pam_krb5_ccache_type = $::winbind::pam_krb5_ccache_type,
$pam_mkhomedir = $::winbind::pam_mkhomedir,
$pam_require_membership_of = $::winbind::pam_require_membership_of,
$pam_silent = $::winbind::pam_silent,
$pam_warn_pwd_expire = $::winbind::pam_warn_pwd_expire,
$smb_encrypt_passwords = $::winbind::smb_encrypt_passwords,
$smb_idmap_config_default_backend = $::winbind::smb_idmap_config_default_backend,
$smb_idmap_config_default_range_end = $::winbind::smb_idmap_config_default_range_end,
$smb_idmap_config_default_rangesize = $::winbind::smb_idmap_config_default_rangesize,
$smb_idmap_config_default_range_start = $::winbind::smb_idmap_config_default_range_start,
$smb_include_dir = $::winbind::smb_includes_dir,
$smb_includes_files = $::winbind::smb_includes_files,
$smb_log_file = $::winbind::smb_log_file,
$smb_log_level = $::winbind::smb_log_level,
$smb_max_log_size = $::winbind::smb_max_log_size,
$smb_printcap_name = $::winbind::smb_printcap_name,
$smb_printing = $::winbind::smb_printing,
$smb_realm = $::winbind::smb_realm,
$smb_security = $::winbind::smb_security,
$smb_server_string = $::winbind::smb_server_string,
$smb_settings_hash = $::winbind::smb_settings_hash,
$smb_syslog = $::winbind::smb_syslog,
$smb_template_homedir = $::winbind::smb_template_homedir,
$smb_template_shell = $::winbind::smb_template_shell,
$smb_winbind_enum_groups = $::winbind::smb_winbind_enum_groups,
$smb_winbind_enum_users = $::winbind::smb_winbind_enum_users,
$smb_winbind_normalize_names = $::winbind::smb_winbind_normalize_names,
$smb_winbind_nss_info = $::winbind::smb_winbind_nss_info,
$smb_winbind_offline_logon = $::winbind::smb_winbind_offline_logon,
$smb_winbind_separator = $::winbind::smb_winbind_separator,
$smb_winbind_use_default_domain = $::winbind::smb_winbind_use_default_domain,
$smb_workgroup = $::winbind::smb_workgroup,
$krb5_libdefaults_default_realm = $::winbind::krb5_libdefaults_default_realm,
$krb5_libdefaults_dns_lookup_kdc = $::winbind::krb5_libdefaults_dns_lookup_kdc,
$krb5_libdefaults_dns_lookup_realm = $::winbind::krb5_libdefaults_dns_lookup_realm,
$krb5_libdefaults_forwardable = $::winbind::krb5_libdefaults_forwardable,
$krb5_libdefaults_renew_lifetime = $::winbind::krb5_libdefaults_renew_lifetime,
$krb5_libdefaults_ticket_lifetime = $::winbind::krb5_libdefaults_ticket_lifetime,
$krb5_logging_admin_server = $::winbind::krb5_logging_admin_server,
$krb5_logging_default = $::winbind::krb5_logging_default,
$krb5_logging_kdc = $::winbind::krb5_logging_kdc,
$krb5_realms_admin_server = $::winbind::krb5_realms_admin_server,
$krb5_realms_kdc = $::winbind::krb5_realms_kdc,
$manage_joindomain_script = $::winbind::manage_joindomain_script,
$manage_samba_service = $::winbind::manage_samba_service,
$package_ensure = $::winbind::package_ensure,
$pam_cached_login = $::winbind::pam_cached_login,
$pam_debug = $::winbind::pam_debug,
$pam_debug_state = $::winbind::pam_debug_state,
$pam_krb5_auth = $::winbind::pam_krb5_auth,
$pam_krb5_ccache_type = $::winbind::pam_krb5_ccache_type,
$pam_mkhomedir = $::winbind::pam_mkhomedir,
$pam_require_membership_of = $::winbind::pam_require_membership_of,
$pam_silent = $::winbind::pam_silent,
$pam_warn_pwd_expire = $::winbind::pam_warn_pwd_expire,
$smb_client_use_spnego = $::winbind::smb_client_use_spnego,
$smb_cups_options = $::winbind::smb_cups_options,
$smb_disable_spoolss = $::winbind::smb_disable_spoolss,
$smb_encrypt_passwords = $::winbind::smb_encrypt_passwords,
$smb_idmap_config_backend = $::winbind::smb_idmap_config_backend,
$smb_idmap_config_base_rid = $::winbind::smb_idmap_config_base_rid,
$smb_idmap_config_range = $::winbind::smb_idmap_config_range,
$smb_idmap_config_rangesize = $::winbind::smb_idmap_config_rangesize,
$smb_kerberos_method = $::winbind::smb_kerberos_method,
$smb_load_printers = $::winbind::smb_load_printers,
$smb_log_file = $::winbind::smb_log_file,
$smb_max_log_size = $::winbind::smb_max_log_size,
$smb_passdb_backend = $::winbind::smb_passdb_backend,
$smb_password_server = $::winbind::smb_password_server,
$smb_printcap_name = $::winbind::smb_printcap_name,
$smb_printing = $::winbind::smb_printing,
$smb_realm = $::winbind::smb_realm,
$smb_security = $::winbind::smb_security,
$smb_server_string = $::winbind::smb_server_string,
$smb_show_add_printer_wizard = $::winbind::smb_show_add_printer_wizard,
$smb_template_homedir = $::winbind::smb_template_homedir,
$smb_template_shell = $::winbind::smb_template_shell,
$smb_winbind_cache_time = $::winbind::smb_winbind_cache_time,
$smb_winbind_enum_groups = $::winbind::smb_winbind_enum_groups,
$smb_winbind_enum_users = $::winbind::smb_winbind_enum_users,
$smb_winbind_offline_logon = $::winbind::smb_winbind_offline_logon,
$smb_winbind_separator = $::winbind::smb_winbind_separator,
$smb_winbind_use_default_domain = $::winbind::smb_winbind_use_default_domain,
$smb_workgroup = $::winbind::smb_workgroup,
# lint:endignore
) {
if $manage_joindomain_script {
Expand All @@ -88,17 +93,6 @@
notify => Service['winbind'],
}

if $::osfamily == 'RedHat' {
file { '/etc/oddjobd.conf.d/oddjobd-mkhomedir.conf':
ensure => 'file',
owner => 'root',
group => 'root',
mode => '0644',
content => template('winbind/oddjobd-mkhomedir.conf.erb'),
notify => Service[['oddjobd', 'winbind',]],
}
}

file { '/etc/samba/smb.conf':
ensure => 'file',
owner => 'root',
Expand All @@ -108,14 +102,6 @@
notify => Service['winbind'],
}

file { $smb_include_dir:
ensure => 'directory',
owner => 'root',
group => 'root',
mode => '0644',
notify => Service['winbind'],
}

file { '/etc/security/pam_winbind.conf':
ensure => 'file',
owner => 'root',
Expand All @@ -125,12 +111,4 @@
notify => Service['winbind'],
}

if ($smb_settings_hash) {
validate_hash($smb_settings_hash)
$defaults = {
'path' => "${smb_include_dir}/smb-extras.conf"
}
create_ini_settings($smb_settings_hash, $defaults)
}

}
Loading