lib/dev-lxc/server.rb in dev-lxc-1.6.2 vs lib/dev-lxc/server.rb in dev-lxc-1.6.3

@@ -151,11 +151,11 @@
       when :custom
         DevLXC::Container.new("c-#{@server.name}", @lxc_config_path).destroy
       when :unique
         DevLXC::Container.new("u-#{@server.name}", @lxc_config_path).destroy
       when :shared
-        DevLXC::Container.new(@shared_image_name, @lxc_config_path).destroy
+        DevLXC::Container.new(@shared_image_name, @lxc_config_path).destroy unless @shared_image_name.empty?
       when :platform
         DevLXC::Container.new(@platform_image_name, @lxc_config_path).destroy
       end
     end
 
@@ -318,10 +318,12 @@
       end
       run_ctl(@server_ctl, "reconfigure")
     end
 
     def configure_reporting
+      FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/var/opt/opscode-reporting")
+      FileUtils.touch("#{@server.config_item('lxc.rootfs')}/var/opt/opscode-reporting/.license.accepted")
       if @role == 'frontend'
         puts "Copying /etc/opscode-reporting from bootstrap backend '#{@chef_server_bootstrap_backend}'"
         FileUtils.cp_r("#{LXC::Container.new(@chef_server_bootstrap_backend, @lxc_config_path).config_item('lxc.rootfs')}/etc/opscode-reporting",
                        "#{@server.config_item('lxc.rootfs')}/etc")
       end
@@ -333,20 +335,24 @@
       run_ctl("opscode-push-jobs-server", "reconfigure")
       run_ctl(@server_ctl, "reconfigure")
     end
 
     def configure_manage
+      FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/var/opt/chef-manage")
+      FileUtils.touch("#{@server.config_item('lxc.rootfs')}/var/opt/chef-manage/.license.accepted")
       if @chef_server_type == 'private-chef'
         puts "Disabling old opscode-webui in /etc/opscode/private-chef.rb"
         DevLXC.search_file_delete_line("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", /opscode_webui[.enable.]/)
         DevLXC.append_line_to_file("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", "\nopscode_webui['enable'] = false\n")
         run_ctl(@server_ctl, "reconfigure")
       end
       run_ctl("opscode-manage", "reconfigure")
     end
 
     def configure_analytics
+      FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/var/opt/opscode-analytics")
+      FileUtils.touch("#{@server.config_item('lxc.rootfs')}/var/opt/opscode-analytics/.license.accepted")
       case @role
       when "standalone", "backend"
         puts "Copying /etc/opscode-analytics from Chef Server bootstrap backend '#{@chef_server_bootstrap_backend}'"
         FileUtils.cp_r("#{LXC::Container.new(@chef_server_bootstrap_backend, @lxc_config_path).config_item('lxc.rootfs')}/etc/opscode-analytics",
                        "#{@server.config_item('lxc.rootfs')}/etc")
@@ -359,9 +365,11 @@
       end
       run_ctl("opscode-analytics", "reconfigure")
     end
 
     def configure_compliance
+      FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/var/opt/chef-compliance")
+      FileUtils.touch("#{@server.config_item('lxc.rootfs')}/var/opt/chef-compliance/.license.accepted")
       run_ctl("chef-compliance", "reconfigure")
     end
 
     def configure_supermarket
       if @chef_server_bootstrap_backend && DevLXC::Container.new(@chef_server_bootstrap_backend, @lxc_config_path).defined?