Compare commits
No commits in common. "a2ca71146bfed0447c3a6d11008cf3dff7a8af0f" and "03f691d38da3f6637332cc4b2406cd95bca761e8" have entirely different histories.
a2ca71146b
...
03f691d38d
|
@ -35,8 +35,7 @@ Examples:
|
||||||
login_search_dn=>"cn=admin,dc=wikimedia,dc=de",
|
login_search_dn=>"cn=admin,dc=wikimedia,dc=de",
|
||||||
login_search_suffix=>"dc=wikimedia,dc=de",
|
login_search_suffix=>"dc=wikimedia,dc=de",
|
||||||
login_search_password=>"123",
|
login_search_password=>"123",
|
||||||
login_method=>"search" # or "list or search allowed",
|
login_method=>"search" # or "listi or search allowed"
|
||||||
server_url=>"ldap://localhost:389",
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -125,10 +125,8 @@ class wmdeit_ldap::lam(
|
||||||
default => $spw
|
default => $spw
|
||||||
},
|
},
|
||||||
|
|
||||||
server_url => $conf['server_url'] ? {
|
|
||||||
undef => "",
|
|
||||||
default => 'ldap://localhost:389'
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -149,8 +147,6 @@ define wmdeit_ldap::lam::config
|
||||||
$login_search_dn = "",
|
$login_search_dn = "",
|
||||||
$login_search_filter = "",
|
$login_search_filter = "",
|
||||||
$login_search_password = "",
|
$login_search_password = "",
|
||||||
$server_url ,
|
|
||||||
|
|
||||||
|
|
||||||
){
|
){
|
||||||
if (!$suffix_user) or (!$suffix_group) {
|
if (!$suffix_user) or (!$suffix_group) {
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
|
|
||||||
# server address (e.g. ldap://localhost:389 or ldaps://localhost:636)
|
# server address (e.g. ldap://localhost:389 or ldaps://localhost:636)
|
||||||
ServerURL: <%= @server_url %>
|
ServerURL: ldap://localhost:389
|
||||||
|
|
||||||
# list of users who are allowed to use LDAP Account Manager
|
# list of users who are allowed to use LDAP Account Manager
|
||||||
# names have to be seperated by semicolons
|
# names have to be seperated by semicolons
|
||||||
|
|
Loading…
Reference in New Issue