bug fix release 2.0.11 updates

Former-commit-id: 7c2d645
sous-chefs · Oct 20, 2015 · bae381d · bae381d
1 parent d611bff
commit bae381d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 =======
+##  2.0.11
+* upgrading to 2.6.0
+* fixing AD auth issues with forcebinding not working correctly
 
 ##  2.0.10
 * separated out apache, java, and rundeck server install, so you can install your own flavors

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -2,11 +2,11 @@
 default['rundeck']['configdir'] = '/etc/rundeck'
 default['rundeck']['basedir'] = '/var/lib/rundeck'
 default['rundeck']['datadir'] = '/var/rundeck'
-default['rundeck']['deb']['package'] = 'rundeck-2.4.2-1-GA.deb'
+default['rundeck']['deb']['package'] = 'rundeck-2.6.0-1-GA.deb'
 default['rundeck']['deb']['options'] = false #--force-confdef --force-confold
-default['rundeck']['rpm']['version'] = '2.5.3-1.10.GA' # rundeck package from http://dl.bintray.com/rundeck/rundeck-rpm
+default['rundeck']['rpm']['version'] = '2.6.0-1.11.GA' # rundeck package from http://dl.bintray.com/rundeck/rundeck-rpm
 default['rundeck']['url'] = "http://download.rundeck.org/deb/#{node['rundeck']['deb']['package']}"
-default['rundeck']['checksum'] = 'd2038440542b64921449e4ea0d7899f723bb29a58d713532fb8a0ab434ddac89'
+default['rundeck']['checksum'] = '46e591f945f053b22c2d508e063332dcfc8ff6b81662d6cb4c645b371ec328bb'
 default['rundeck']['port'] = 4440
 default['rundeck']['jaas'] = 'internal'
 default['rundeck']['default_role'] = 'user'

diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license          'All rights reserved'
 description      'Installs and configures Rundeck 2.x'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '2.0.10'
+version          '2.0.11'
 depends          'runit'
 depends          'sudo'
 depends          'java'

diff --git a/templates/default/jaas-activedirectory.conf.erb b/templates/default/jaas-activedirectory.conf.erb
@@ -3,7 +3,7 @@ activedirectory {
     debug="true"
     contextFactory="com.sun.jndi.ldap.LdapCtxFactory"
     providerUrl="<%=@ldap[:provider]%>"
-<% unless @ldap[:forcebindinglogin] -%>
+<% if !@ldap[:binddn].nil? -%>
     bindDn="<%=@ldap[:binddn]%>"
     bindPassword="<%=@ldap[:bindpwd]%>"
 <% end -%>
@@ -28,6 +28,7 @@ activedirectory {
     supplementalRoles="<%=@ldap[:supplementalroles]%>"
 <% end -%>
     reportStatistics="<%=@ldap[:reportstatistics]%>";
+
     org.eclipse.jetty.plus.jaas.spi.PropertyFileLoginModule required
     debug="true"
     file="<%=@configdir%>/realm.properties";