Merge pull request #32 from tmaier/feature/reset-new-admin-pw

Only run if new_admin_password is really new
tacitknowledge · Jul 31, 2015 · b67d489 · b67d489
2 parents c9bb090 + 1fd00d5
commit b67d489
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 18 deletions.
diff --git a/recipes/author.rb b/recipes/author.rb
@@ -76,16 +76,23 @@
 end
 
 #Change admin password
-unless node[:aem][:author][:new_admin_password].nil?
-  aem_user node[:aem][:author][:admin_user] do
-    password node[:aem][:author][:new_admin_password]
-    admin_user node[:aem][:author][:admin_user]
-    admin_password node[:aem][:author][:admin_password]
-    port node[:aem][:author][:port]
-    aem_version node[:aem][:version]
-    action :set_password
+aem_user node[:aem][:author][:admin_user] do
+  password node[:aem][:author][:new_admin_password]
+  admin_user node[:aem][:author][:admin_user]
+  admin_password node[:aem][:author][:admin_password]
+  port node[:aem][:author][:port]
+  aem_version node[:aem][:version]
+  action :set_password
+  only_if { node[:aem][:author][:new_admin_password] }
+  not_if { node[:aem][:author][:new_admin_password] == node[:aem][:author][:admin_password] }
+  notifies :run, 'ruby_block[Store new admin password in node]', :immediately
+end
+
+ruby_block 'Store new admin password in node' do
+  block do
+    node.set[:aem][:author][:admin_password] = node[:aem][:author][:new_admin_password]
   end
-  node.set[:aem][:author][:admin_password] = node[:aem][:author][:new_admin_password]
+  action :nothing
 end
 
 #delete the privileged users from geometrixx, if they're still there.

diff --git a/recipes/publish.rb b/recipes/publish.rb
@@ -76,16 +76,23 @@
 end
 
 #Change admin password
-unless node[:aem][:publish][:new_admin_password].nil?
-  aem_user node[:aem][:publish][:admin_user] do
-    password node[:aem][:publish][:new_admin_password]
-    admin_user node[:aem][:publish][:admin_user]
-    admin_password node[:aem][:publish][:admin_password]
-    port node[:aem][:publish][:port]
-    aem_version node[:aem][:version]
-    action :set_password
+aem_user node[:aem][:publish][:admin_user] do
+  password node[:aem][:publish][:new_admin_password]
+  admin_user node[:aem][:publish][:admin_user]
+  admin_password node[:aem][:publish][:admin_password]
+  port node[:aem][:publish][:port]
+  aem_version node[:aem][:version]
+  action :set_password
+  only_if { node[:aem][:publish][:new_admin_password] }
+  not_if { node[:aem][:publish][:new_admin_password] == node[:aem][:publish][:admin_password] }
+  notifies :run, 'ruby_block[Store new admin password in node]', :immediately
+end
+
+ruby_block 'Store new admin password in node' do
+  block do
+    node.set[:aem][:publish][:admin_password] = node[:aem][:publish][:new_admin_password]
   end
-  node.set[:aem][:publish][:admin_password] = node[:aem][:publish][:new_admin_password]
+  action :nothing
 end
 
 #delete the privileged users from geometrixx, if they're still there.