Cookbook

attributes/default.rb

@@ -26,7 +26,11 @@
 default[:aem][:jar_name] = nil
 default[:aem][:use_yum] = false
 default[:aem][:download_url] = nil
+default[:aem][:install_pkgs_on_start] = nil
 default[:aem][:license_url] = nil
+default[:aem][:license_customer_name] = nil
+default[:aem][:license_download_id] = nil
+default[:aem][:license_product_name] = 'Adobe CQ5'
 default[:aem][:base_dir] = '/opt/aem'
 default[:aem][:cluster_name] = nil
 default[:aem][:geometrixx_priv_users] = [
@@ -140,6 +144,14 @@
     #    :action => [ :upload, :install, :activate ]
     #  }
   ],
+  install_pkgs_on_start: [
+	# Automate prerequisites deployment on stack creation WEB-3137
+  ],
+  install_bundles: [],
+  delete_bundles: [],
+  restart_bundles: [],
+  stop_bundles: [],
+
   # You changed these, right?
   admin_user: 'admin',
   admin_password: 'admin',
@@ -175,6 +187,9 @@
   deploy_pkgs: [
     # See the format in author, above
   ],
+  install_pkgs_on_start: [
+        # Automate prerequisites deployment on stack creation WEB-3137
+  ],
   admin_user: 'admin',
   admin_password: 'admin',
   new_admin_password: nil,
@@ -185,7 +200,11 @@
     #  :password => "the admin password on the remote"
     # }
   ],
-  find_cache_hosts_dynamically: false
+  find_cache_hosts_dynamically: false,
+  install_bundles: [],
+  delete_bundles: [],
+  restart_bundles: [],
+  stop_bundles: []
 }
 default[:aem][:publish][:startup][:max_attempts] = 20
 default[:aem][:publish][:startup][:wait_between_attempts] = 30

providers/bundle.rb

@@ -0,0 +1,96 @@
+# This provider manages AEM bundles. It is not intended for production use,
+# though it can be useful for standing-up developer environments.  If you
+# really want to use this for production, you should add some real error
+# checking on the output of the curl commands.
+
+def set_vars
+  # Set up vars
+  vars = {}
+  vars[:bundle_name] = "#{new_resource.name}"
+  vars[:file_name] = "#{new_resource.name}-#{new_resource.version}" \
+                     "#{new_resource.file_extension}"
+  vars[:download_url] = new_resource.bundle_url
+  vars[:file_path] = "#{Chef::Config[:file_cache_path]}/#{vars[:file_name]}"
+  vars[:user] = new_resource.user
+  vars[:password] = new_resource.password
+  vars[:port] = new_resource.port
+
+  vars[:install_cmd] = "curl -u #{vars[:user]}:#{vars[:password]} " \
+                          "-F action=install -F bundlestartlevel=20 " \
+                          "-F bundlefile=@#{vars[:file_path]} http://localhost:#{vars[:port]}/system/console/bundles"
+  vars[:stop_cmd] = "curl -u #{vars[:user]}:#{vars[:password]} " \
+                          "-F action=stop " \
+                          "http://localhost:#{vars[:port]}/system/console/bundles/#{vars[:bundle_name]}"
+  vars[:start_cmd] = "curl -u #{vars[:user]}:#{vars[:password]} " \
+                          "-F action=start " \
+                          "http://localhost:#{vars[:port]}/system/console/bundles/#{vars[:bundle_name]}"
+  # Delete command removes default Felix configuration so as to make sure that CRX configuration
+  # from /apps/config.runmode are correctly picked up
+  vars[:delete_cmd] = "curl -u #{vars[:user]}:#{vars[:password]} " \
+                          "-F action=delete " \
+                          "http://localhost:#{vars[:port]}/system/console/bundles/#{vars[:bundle_name]}"
+  # Uninstall command removes the bundle
+  vars[:uninstall_cmd] = "curl -u #{vars[:user]}:#{vars[:password]} " \
+                          "-daction=uninstall " \
+                          "http://localhost:#{vars[:port]}/system/console/bundles/#{vars[:bundle_name]}"
+  vars
+end
+
+
+action :install_bundle do
+  vars = set_vars
+  r = remote_file vars[:file_path] do
+    source vars[:download_url]
+    mode 0755
+    action :nothing
+  end
+  r.run_action(:create)
+
+  install = Mixlib::ShellOut.new(vars[:install_cmd])
+  log "Installing AEM Felix bundle with command: #{vars[:install_cmd]}"
+  install.run_command
+  install.error!
+  log install.stdout
+end
+
+action :stop_bundle do
+  vars = set_vars
+  stop = Mixlib::ShellOut.new(vars[:stop_cmd])
+  log "Stopping AEM bundle with command: #{vars[:stop_cmd]}"
+  stop.run_command
+  stop.error!
+  log stop.stdout
+end
+
+action :start_bundle do
+  vars = set_vars
+  start = Mixlib::ShellOut.new(vars[:start_cmd])
+  log "Starting AEM bundle with command: #{vars[:start_cmd]}"
+  start.run_command
+  start.error!
+  log start.stdout
+end
+
+action :delete_bundle do
+  vars = set_vars
+  delete = Mixlib::ShellOut.new(vars[:delete_cmd])
+  log "Deleting AEM bundle with command: #{vars[:delete_cmd]}"
+  delete.run_command
+  delete.error!
+  log delete.stdout
+  file vars[:file_path] do
+    action :delete
+  end
+end
+
+action :uninstall_bundle do
+  vars = set_vars
+  uninstall = Mixlib::ShellOut.new(vars[:uninstall_cmd])
+  log "Uninstalling AEM bundle with command: #{vars[:uninstall_cmd]}"
+  uninstall.run_command
+  uninstall.error!
+  log uninstall.stdout
+  file vars[:file_path] do
+    action :uninstall
+  end
+end

providers/dispatcher.rb

@@ -50,7 +50,7 @@
           owner 'root'
           group 'root'
           action :create
-          notifies :restart, service_name
+          notifies :restart, service_name, :delayed
         end
       else
         # extract out the module.so

providers/farm.rb

@@ -62,7 +62,8 @@
         name: r[:fqdn],
         hostname: r[:ipaddress],
         port: r[:aem][cluster_type][:port],
-        timeout: timeout
+        timeout: timeout,
+        receiveTimeout: receiveTimeout
       }
     end
     # Don't ever return an empty renders list, or apache won't start and

providers/group.rb

@@ -27,19 +27,15 @@ def set_vars
   [ group, admin_user, admin_password, port, aem_version, path ]
 end
 
-def curl(url, user, password)
-  c = Curl::Easy.new(url)
-  c.http_auth_types = :basic
-  c.username = user
-  c.password = password
-  c.perform
-  c
+def http_get(url, user, password)
+  res = RestClient::Resource.new(url, user, password)
+  res.get
 end
 
 def get_group_path(port, group, admin_user, admin_password)
   url = "http://localhost:#{port}/bin/querybuilder.json?path=/home/groups&1_property=rep:authorizableId&1_property.value=#{group}&p.limit=-1"
-  c = curl(url, admin_user, admin_password)
-  group_json = JSON.parse(c.body_str)
+  res = http_get(url, admin_user, admin_password)
+  group_json = JSON.parse(res.body_str)
 
   path = nil
   hits = group_json['hits']

providers/jcr_node.rb

@@ -18,35 +18,26 @@
 
 # This provider manages an AEM JCR node
 
-def curl(url, user, password)
-  c = Curl::Easy.new(url)
-  c.http_auth_types = :basic
-  c.username = user
-  c.password = password
-  c.perform
-  c
+def http_get(url, user, password)
+  res = RestClient::Resource.new(url, user, password)
+  res.get
 end
 
-def curl_form(url, user, password, fields)
-  c = Curl::Easy.http_post(url, *fields)
-  c.http_auth_types = :basic
-  c.username = user
-  c.password = password
-  c.multipart_form_post = true
-  c.perform
-  c
+def http_post(url, user, password, fields)
+  res = RestClient::Resource.new(url, user, password)
+  res.post(fields)
 end
 
 def check_node(url, user, password, name)
   url = "#{url}/#{name}"
-  c = curl(url, user, password)
-  case c.response_code
+  res = http_get(url, user, password)
+  case res.code
   when 200, 201
-    c.body_str
+    res.to_str
   when 404
     false
   else
-    fail "Unable to read JCR node at #{url}. response_code: #{c.response_code} response: #{c.body_str}"
+    fail "Unable to read JCR node at #{url}. response_code: #{res.code} response: #{res.to_str}"
   end
 end
 
@@ -60,16 +51,21 @@ def make_url(new_resource)
   case new_resource.type
   when 'file'
     unless check_node(url, new_resource.user, new_resource.password, new_resource.name) == new_resource.contents
-      fields = [
-        Curl::PostField.file(new_resource.name, new_resource.contents),
-        Curl::PostField.content("#{new_resource.name}@TypeHint", 'Binary')
-      ]
-      c = curl_form(url, new_resource.user, new_resource.password, fields)
-      if c.response_code == 200 || c.response_code == 201
+      # EH This doesn't work!! Fields need to be in right format, need to figure out what AEM api expects
+      fields = {operation: 'post', metadata: new_resource.name, :content => new_resource.contents }
+
+      #[
+      #  Curl::PostField.file(new_resource.name, new_resource.contents),
+      #  Curl::PostField.content("#{new_resource.name}@TypeHint", 'Binary')
+      #]
+
+
+      res = http_post(url, new_resource.user, new_resource.password, fields)
+      if res.code == 200 || res.code == 201
         new_resource.updated_by_last_action(true)
         Chef::Log.debug("New jcr_node was created at #{new_resource.path}")
       else
-        fail "JCR Node Creation failed.  HTTP code: #{c.response_code}"
+        fail "JCR Node Creation failed.  HTTP code: #{res.code}"
       end
     end
   else
@@ -81,12 +77,13 @@ def make_url(new_resource)
   url = make_url(new_resource)
   if check_node(url, new_resource.user, new_resource.password, new_resource.name)
     # If the node exists, delete it
-    fields = [Curl::PostField.content(':operation', 'delete')]
-    c = curl_form(url, new_resource.user, new_resource.password, fields)
-    if c.response_code == 200 || c.response_code == 201
+    # EH might not have to be multipart
+    fields = {operation: 'delete', multipart: true}
+    res = http_post(url, new_resource.user, new_resource.password, fields)
+    if res.code == 200 || res.code == 201
       new_resource.updated_by_last_action(true)
     else
-      fail "JCR Node Deletion failed.  HTTP code: #{c.response_code}"
+      fail "JCR Node Deletion failed.  HTTP code: #{res.code}"
     end
   end
 end

providers/prerequisite_installer.rb

@@ -0,0 +1,47 @@
+#
+# Cookbook Name:: aem
+# Provider:: prerequisite_installer
+#
+# Copyright 2012, Tacit Knowledge, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+action :install do
+	# Use fallback attributes if property isn't passed 
+	base_dir = new_resource.base_dir || node[:aem][:base_dir]
+	install_pkgs_on_start = new_resource.install_pkgs_on_start || node[:aem][:install_pkgs_on_start]
+	package_store_url = new_resource.package_store_url || node[:aem][:package_store_url]
+
+	install_dir = base_dir + '/install'
+
+	directory install_dir do
+	  owner 'crx'
+	  group 'crx'
+	  mode '0755'
+	  action :create
+	end
+
+	install_pkgs_on_start.each_with_index do |file,index|
+		# prepending index, since aem installs packages in alphabet order 
+		file_name = index.to_s + '_' + ::File.basename(file)
+
+   	remote_file "#{install_dir}/#{file_name}" do
+      source "#{package_store_url}/#{file}"
+      owner 'crx'
+      group 'crx'
+      mode "0644"
+      action :create_if_missing
+    end
+  end
+end
+

providers/url_watcher.rb

@@ -31,9 +31,9 @@
     creds = "-u #{new_resource.user}:#{new_resource.password}"
   end
   if new_resource.match_string
-    curl_validation_command = %(curl #{creds} --silent #{validation_url} | grep "#{new_resource.match_string}")
+    curl_validation_command = %(curl #{creds} -L --silent #{validation_url} | grep "#{new_resource.match_string}")
   else
-    curl_validation_command = "curl #{creds} -o /dev/null --silent --head --write-out '%{http_code}' #{validation_url} | grep 200"
+    curl_validation_command = "curl #{creds} -L -o /dev/null --silent --head --write-out '%{http_code}' #{validation_url} | grep 200"
   end
 
   bash "wait for URL: #{validation_url}" do

providers/user.rb

@@ -33,19 +33,15 @@ def set_vars
   [user, password, admin_user, admin_password, port, aem_version, path, group]
 end
 
-def curl(url, user, password)
-  c = Curl::Easy.new(url)
-  c.http_auth_types = :basic
-  c.username = user
-  c.password = password
-  c.perform
-  c
+def http_get(url, user, password)
+  res = RestClient::Resource.new(url, user, password)
+  res.get
 end
 
 def get_usr_path(port, user, admin_user, admin_password)
   url_user = "http://localhost:#{port}/bin/querybuilder.json?path=/home/users&1_property=rep:authorizableId&1_property.value=#{user}&p.limit=-1"
-  c = curl(url_user, admin_user, admin_password)
-  usr_json = JSON.parse(c.body_str)
+  res = http_get(url_user, admin_user, admin_password)
+  usr_json = JSON.parse(res.to_str)
 
   path = nil
   hits = usr_json['hits']