Skip to content

Commit 71891be

Browse files
author
jtimberman
committed
updating chef cookbook for 0.8 attribute and recipe updates
1 parent 2d0e3fb commit 71891be

7 files changed

Lines changed: 47 additions & 85 deletions

File tree

‎chef/attributes/chef.rb‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
# See the License for the specific language governing permissions and
1818
# limitations under the License.
1919

20-
validation_token = ""
21-
chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
22-
20.times { |i| validation_token << chars[rand(chars.size-1)] }
20+
::Chef::Node.send(:include, Opscode::OpenSSL::Password)
2321

2422
set_unless[:chef][:umask] = 0022
2523
set_unless[:chef][:url_type] = "http"
@@ -38,11 +36,15 @@
3836
set_unless[:chef][:serve_path] = "/srv/chef"
3937
end
4038

41-
set_unless[:chef][:server_version] = "0.7.16"
42-
set_unless[:chef][:client_version] = "0.7.16"
39+
set_unless[:chef][:server_version] = "0.8.0"
40+
set_unless[:chef][:client_version] = "0.8.0"
4341
set_unless[:chef][:client_interval] = "1800"
4442
set_unless[:chef][:client_splay] = "20"
4543
set_unless[:chef][:log_dir] = "/var/log/chef"
44+
set_unless[:chef][:server_port] = "4000"
45+
set_unless[:chef][:webui_port] = "4040"
46+
set_unless[:chef][:webui_enabled] = false
47+
set_unless[:chef][:webui_admin_password] = secure_password
4648

4749
case chef[:init_style]
4850
when "runit"
@@ -56,6 +58,5 @@
5658
end
5759

5860
set_unless[:chef][:server_fqdn] = domain ? "chef.#{domain}" : "chef"
59-
set_unless[:chef][:server_token] = validation_token
6061
set_unless[:chef][:server_ssl_req] = "/C=US/ST=Several/L=Locality/O=Example/OU=Operations/" +
6162
"CN=#{chef[:server_fqdn]}/emailAddress=ops@#{domain}"

‎chef/attributes/server_proxy.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# See the License for the specific language governing permissions and
1818
# limitations under the License.
1919

20-
set_unless[:chef][:doc_root] = "/usr/share/chef-server-slice/public"
20+
set_unless[:chef][:doc_root] = "#{languages[:ruby][:gems_dir]}/chef-server-webui-#{chef[:server_version]}"
2121

2222
set_unless[:chef][:server_proxy][:css_expire_hours] = "120"
23-
set_unless[:chef][:server_proxy][:js_expire_hours] = "24"
23+
set_unless[:chef][:server_proxy][:js_expire_hours] = "24"

‎chef/metadata.rb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
license "Apache 2.0"
44
description "Installs and configures chef client and server"
55
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
6-
version "0.13"
6+
version "0.14"
77
recipe "chef::client", "Sets up a client to talk to a chef-server"
8-
recipe "chef::server", "Configures a chef-server as a passenger application"
8+
recipe "chef::server", "Configures a chef API server as a merb application"
99

10-
%w{ runit packages couchdb stompserver apache2 passenger_apache2 }.each do |cb|
11-
depends cb
10+
%w{ ubuntu debian redhat centos fedora freebsd openbsd }.each do |os|
11+
supports os
1212
end
1313

14-
%w{ centos rhel ubuntu debian }.each do |os|
15-
supports os
14+
%w{ runit couchdb rabbitmq_chef apache2 openssl zlib xml java }.each do |cb|
15+
depends cb
1616
end
1717

1818
attribute "chef/path",
@@ -28,7 +28,7 @@
2828
attribute "chef/client_version",
2929
:display_name => "Chef Client Version",
3030
:description => "Set the version of the client gem to install",
31-
:default => "0.7.10"
31+
:default => "0.8.0"
3232

3333
attribute "chef/client_interval",
3434
:display_name => "Chef Client Interval ",
@@ -53,7 +53,7 @@
5353
attribute "chef/server_version",
5454
:display_name => "Chef Server Version",
5555
:description => "Set the version of the server and server-slice gems to install",
56-
:default => "0.7.10"
56+
:default => "0.8.0"
5757

5858
attribute "chef/server_log",
5959
:display_name => "Chef Server Log",

‎chef/recipes/server_proxy.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"default" => "root"
2424
)
2525

26-
node[:apache][:listen_ports] << "444" unless node[:apache][:listen_ports].include?("444")
26+
node[:apache][:listen_ports] << "443" unless node[:apache][:listen_ports].include?("443")
2727

2828
include_recipe "chef::server"
2929
include_recipe "apache2"

‎chef/templates/default/chef_server.conf.erb‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
ExpiresByType application/javascript "access plus <%= @node[:chef][:server_proxy][:js_expire_hours] %> hours"
1212

1313
<Proxy balancer://chef_server>
14-
BalancerMember http://127.0.0.1:4000
14+
BalancerMember http://127.0.0.1:<%= @node[:chef][:webui_port]
1515
Order deny,allow
1616
Allow from all
1717
</Proxy>
@@ -30,36 +30,3 @@
3030
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
3131
RewriteRule ^/(.*)$ balancer://chef_server%{REQUEST_URI} [P,QSA,L]
3232
</VirtualHost>
33-
34-
<VirtualHost *:444>
35-
ServerName <%= @params[:server_name] %>
36-
ServerAlias <% @params[:server_aliases].each do |a| %><%= "#{a}" %> <% end %>
37-
38-
DocumentRoot <%= @node[:chef][:doc_root] %>
39-
40-
ExpiresActive On
41-
ExpiresByType text/css "access plus <%= @node[:chef][:server_proxy][:css_expire_hours] %> hours"
42-
ExpiresByType text/javascript "access plus <%= @node[:chef][:server_proxy][:js_expire_hours] %> hours"
43-
ExpiresByType application/x-javascript "access plus <%= @node[:chef][:server_proxy][:js_expire_hours] %> hours"
44-
ExpiresByType application/javascript "access plus <%= @node[:chef][:server_proxy][:js_expire_hours] %> hours"
45-
46-
<Proxy balancer://chef_server_openid>
47-
BalancerMember http://127.0.0.1:4001
48-
Order deny,allow
49-
Allow from all
50-
</Proxy>
51-
52-
LogLevel info
53-
ErrorLog <%= @params[:log_dir] %>/<%= @params[:name] %>-error.log
54-
CustomLog <%= @params[:log_dir] %>/<%= @params[:name] %>-access.log combined
55-
56-
SSLEngine On
57-
SSLCertificateFile /etc/chef/certificates/<%= @params[:server_name] %>.pem
58-
SSLCertificateKeyFile /etc/chef/certificates/<%= @params[:server_name] %>.pem
59-
60-
RequestHeader set X_FORWARDED_PROTO 'https'
61-
62-
RewriteEngine On
63-
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
64-
RewriteRule ^/(.*)$ balancer://chef_server_openid%{REQUEST_URI} [P,QSA,L]
65-
</VirtualHost>

‎chef/templates/default/client.rb.erb‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,13 @@
77
log_level :info
88
log_location <%= @client_log %>
99
ssl_verify_mode :verify_none
10-
<% if @node[:chef][:url_type] == "https" -%>
11-
registration_url "https://<%= @node[:chef][:server_fqdn] %>"
12-
openid_url "https://<%= @node[:chef][:server_fqdn] %>:444"
13-
template_url "https://<%= @node[:chef][:server_fqdn] %>"
14-
remotefile_url "https://<%= @node[:chef][:server_fqdn] %>"
15-
search_url "https://<%= @node[:chef][:server_fqdn] %>"
16-
role_url "https://<%= @node[:chef][:server_fqdn] %>"
17-
client_url "https://<%= @node[:chef][:server_fqdn] %>"
18-
<% else -%>
19-
registration_url "http://<%= @node[:chef][:server_fqdn] %>:4000"
20-
openid_url "http://<%= @node[:chef][:server_fqdn] %>:4001"
21-
template_url "http://<%= @node[:chef][:server_fqdn] %>:4000"
22-
remotefile_url "http://<%= @node[:chef][:server_fqdn] %>:4000"
23-
search_url "http://<%= @node[:chef][:server_fqdn] %>:4000"
24-
role_url "http://<%= @node[:chef][:server_fqdn] %>:4000"
25-
client_url "http://<%= @node[:chef][:server_fqdn] %>:4000"
26-
<% end -%>
10+
chef_server_url "<%= @node[:chef][:url_type] %>://<%= @node[:chef][:server_fqdn] %>:<%= @node[:chef][:server_port] %>"
2711

28-
file_cache_path "<%= @node[:chef][:cache_path] %>"
12+
validation_client_name "validator"
13+
validation_key "/etc/chef/validation.pem"
14+
client_key "/etc/chef/client.pem"
2915

16+
file_cache_path "<%= @node[:chef][:cache_path] %>"
3017
pid_file "<%= @node[:chef][:run_path] %>/client.pid"
3118

32-
Chef::Log::Formatter.show_time = <%= @show_time %>
19+
Mixlib::Log::Formatter.show_time = <%= @show_time %>

‎chef/templates/default/server.rb.erb‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,12 @@
66
log_level :info
77
log_location <%= @server_log %>
88
ssl_verify_mode :verify_none
9-
registration_url "http://<%= @node[:chef][:server_fqdn] %>:4000"
10-
openid_url "http://<%= @node[:chef][:server_fqdn] %>:4001"
11-
template_url "http://<%= @node[:chef][:server_fqdn] %>:4000"
12-
remotefile_url "http://<%= @node[:chef][:server_fqdn] %>:4000"
13-
search_url "http://<%= @node[:chef][:server_fqdn] %>:4000"
14-
role_url "http://<%= @node[:chef][:server_fqdn] %>:4000"
15-
client_url "http://<%= @node[:chef][:server_fqdn] %>:4000"
9+
chef_server_url "<%= @node[:chef][:url_type] %>://<%= @node[:chef][:server_fqdn] %>:<%= @node[:chef][:server_port] %>"
1610

17-
validation_token "<%= @node[:chef][:server_token] %>"
11+
signing_ca_path "<%= @node[:chef][:path] %>/ca"
12+
couchdb_database 'chef'
1813

19-
cookbook_path [ "<%= @node[:chef][:serve_path] %>/site-cookbooks", "<%= @node[:chef][:serve_path] %>/cookbooks" ]
14+
cookbook_path [ "<%= @node[:chef][:serve_path] %>/cookbooks", "<%= @node[:chef][:serve_path] %>/site-cookbooks" ]
2015

2116
file_cache_path "<%= @node[:chef][:cache_path] %>"
2217
node_path "<%= @node[:chef][:serve_path] %>/nodes"
@@ -25,11 +20,23 @@ openid_cstore_path "<%= @node[:chef][:path] %>/openid/cstore"
2520
search_index_path "<%= @node[:chef][:path] %>/search_index"
2621
role_path "<%= @node[:chef][:serve_path] %>/roles"
2722

28-
umask <%= @node[:chef][:umask] %>
23+
validation_client_name "validator"
24+
validation_key "/etc/chef/validation.pem"
25+
client_key "/etc/chef/client.pem"
26+
web_ui_client_name "chef-webui"
27+
web_ui_key "/etc/chef/webui.pem"
28+
29+
<% if @node[:chef][:webui_enabled] -%>
30+
web_ui_admin_user_name "admin"
31+
web_ui_admin_default_password "<%= @node[:chef][:webui_admin_password] %>"
2932

30-
# See http://wiki.opscode.com/display/chef/Securing+Chef+Server
31-
# For more information on these settings.
32-
#authorized_openid_providers [ "https://<%= @node[:chef][:server_fqdn]%>", "https://chef", "myopenid.com" ]
33-
#authorized_openid_identifiers [ "" ]
33+
<% end -%>
34+
supportdir = "<%= @node[:chef][:path] %>/support"
35+
solr_jetty_path File.join(supportdir, "solr", "jetty")
36+
solr_data_path File.join(supportdir, "solr", "data")
37+
solr_home_path File.join(supportdir, "solr", "home")
38+
solr_heap_size "256M"
39+
40+
umask <%= @node[:chef][:umask] %>
3441

35-
Chef::Log::Formatter.show_time = <%= @show_time %>
42+
Mixlib::Log::Formatter.show_time = <%= @show_time %>

0 commit comments

Comments
 (0)