diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-12-30 00:02:01 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-12-30 00:02:01 -0200 |
| commit | fa635e9150e8e1042f357ad328b43f41e5c804b2 (patch) | |
| tree | 2a535441b8d92a71d6e4f7c453d3bb479e11df4c /templates | |
| parent | 309d5859d9c801218075789fe068869ab49065f5 (diff) | |
| parent | 1020f7ca2be81c64f4a56816731390a852b62e89 (diff) | |
| download | puppet-samba-fa635e9150e8e1042f357ad328b43f41e5c804b2.tar.gz puppet-samba-fa635e9150e8e1042f357ad328b43f41e5c804b2.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/configure_active_directory.erb | 2 | ||||
| -rw-r--r-- | templates/verify_active_directory.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/configure_active_directory.erb b/templates/configure_active_directory.erb index 4f9b6e0..1e74560 100644 --- a/templates/configure_active_directory.erb +++ b/templates/configure_active_directory.erb @@ -57,7 +57,7 @@ done password='<%= scope.lookupvar('samba::server::ads::winbind_pass') -%>' # short hostname from facter -my_hostname="<%= hostname -%>" +my_hostname="<%= @hostname -%>" # what account do we use for net ads commands? winbind_acct="<%= scope.lookupvar('samba::server::ads::winbind_acct') -%>" diff --git a/templates/verify_active_directory.erb b/templates/verify_active_directory.erb index 0917c49..c88d6a4 100644 --- a/templates/verify_active_directory.erb +++ b/templates/verify_active_directory.erb @@ -24,7 +24,7 @@ fi password='<%= scope.lookupvar('samba::server::ads::winbind_pass') -%>' # short hostname from facter -my_hostname="<%= hostname -%>" +my_hostname="<%= @hostname -%>" winbind_acct="<%= scope.lookupvar('samba::server::ads::winbind_acct') -%>" |