imagery: do not use abc subdomains in js

[chef.git] / cookbooks / chef / recipes / server.rb

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index c6ee6f7eb2afdac87e359a08d29a0766ae7bebec..48fbfd7479ac091636b1e8ea632b20b1488f1ae0 100644 (file)
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -18,6 +18,7 @@
 #
 
 include_recipe "apache"
 #
 
 include_recipe "apache"

+include_recipe "chef::knife"

 include_recipe "munin"
 
 # cache_dir = Chef::Config[:file_cache_path]
 include_recipe "munin"
 
 # cache_dir = Chef::Config[:file_cache_path]


@@ -35,7 +36,7 @@ include_recipe "munin"
 # end
 #
 # remote_file "#{cache_dir}/#{chef_package}" do
 # end
 #
 # remote_file "#{cache_dir}/#{chef_package}" do

-#   source "https://packages.chef.io/files/stable/chef-server/#{chef_version}/ubuntu/16.04/#{chef_package}"
+#   source "https://packages.chef.io/files/stable/chef-server/#{chef_version}/ubuntu/20.04/chef-server-core_#{chef_version}-1_amd64.deb"

 #   owner "root"
 #   group "root"
 #   mode 0644
 #   owner "root"
 #   group "root"
 #   mode 0644


@@ -48,8 +49,6 @@ include_recipe "munin"
 #   notifies :run, "execute[chef-server-reconfigure]"
 # end
 
 #   notifies :run, "execute[chef-server-reconfigure]"
 # end
 

-chef_gem "knife"
-

 template "/etc/opscode/chef-server.rb" do
   source "server.rb.erb"
   owner "root"
 template "/etc/opscode/chef-server.rb" do
   source "server.rb.erb"
   owner "root"