Use apt to install python geojson library

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

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index d3a26755a4b21029c85986d020902b211762b58d..d5923ccb6dc7fdc39dfa3e905fc2d37d135b9d59 100644 (file)
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: chef
+# Cookbook:: chef

 # Recipe:: server
 #
 # Recipe:: server
 #

-# Copyright 2010, OpenStreetMap Foundation
+# Copyright:: 2010, OpenStreetMap Foundation

 #
 # 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
 #
 #
 # 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
+#     https://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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -18,26 +18,24 @@
 #
 
 include_recipe "apache"
 #
 
 include_recipe "apache"

+include_recipe "chef::knife"

 
 

-# chef_package = "chef-server-core_#{node[:chef][:server][:version]}_amd64.deb"
+# cache_dir = Chef::Config[:file_cache_path]

 #
 #

-# directory "/var/cache/chef" do
-#   owner "root"
-#   group "root"
-#   mode 0755
-# end
+# chef_version = node[:chef][:server][:version]
+# chef_package = "chef-server-core_#{chef_version}-1_amd64.deb"
+#
+# Dir.glob("#{cache_dir}/chef-server-core_*.deb").each do |deb|
+#   next if deb == "#{cache_dir}/#{chef_package}"

 #
 #

-# Dir.glob("/var/cache/chef/chef-server-core_*.deb").each do |deb|
-#   next if deb == "/var/cache/chef/#{chef_package}"
-

 #   file deb do
 #     action :delete
 #     backup false
 #   end
 # end
 #
 #   file deb do
 #     action :delete
 #     backup false
 #   end
 # end
 #

-# remote_file "/var/cache/chef/#{chef_package}" do
-#   source "https://web-dl.packagecloud.io/chef/stable/packages/ubuntu/#{node[:lsb][:codename]}/#{chef_package}"
+# remote_file "#{cache_dir}/#{chef_package}" do
+#   source "https://packages.chef.io/files/stable/chef-server/#{chef_version}/ubuntu/22.04/chef-server-core_#{chef_version}-1_amd64.deb"

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


@@ -45,8 +43,8 @@ include_recipe "apache"
 # end
 #
 # dpkg_package "chef-server-core" do
 # end
 #
 # dpkg_package "chef-server-core" do

-#   source "/var/cache/chef/#{chef_package}"
-#   version node[:chef][:server][:version]
+#   source "#{cache_dir}/#{chef_package}"
+#   version "#{chef_version}-1"

 #   notifies :run, "execute[chef-server-reconfigure]"
 # end
 
 #   notifies :run, "execute[chef-server-reconfigure]"
 # end
 


@@ -54,7 +52,7 @@ template "/etc/opscode/chef-server.rb" do
   source "server.rb.erb"
   owner "root"
   group "root"
   source "server.rb.erb"
   owner "root"
   group "root"

-  mode 0o640
+  mode "640"

   notifies :run, "execute[chef-server-reconfigure]"
 end
 
   notifies :run, "execute[chef-server-reconfigure]"
 end
 


@@ -100,7 +98,5 @@ template "/etc/cron.daily/chef-server-backup" do
   source "server-backup.cron.erb"
   owner "root"
   group "root"
   source "server-backup.cron.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 end

-
-munin_plugin "chef_status"