Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the variable name used for hex address #2

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix the variable name used for hex address #2

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
46816e8
Fix the variable name used for hex address
nogweii Jul 18, 2015
bae8e2a
version bump
nogweii Jul 18, 2015
f05cd8c
Revert "version bump"
nogweii Aug 1, 2015
76a1c1d
Arch-specific: Set the correct service name
nogweii Aug 1, 2015
eb55dfc
Switch to case, use the right value for arch family
nogweii Aug 1, 2015
520608d
Chef always manages the contents of the host file
nogweii Aug 13, 2015
d461e1b
Don't try to read the key if it doesn't exist
nogweii Sep 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def hex_address_unique?(hex_address)
Chef::Log.warn('Running solo, cannot check address uniqueness')
return true
else
return search(:node, "tinc_hex_address:#{ha}").empty?
return search(:node, "tinc_hex_address:#{hex_address}").empty?
end
end

Expand Down Expand Up @@ -60,13 +60,24 @@ def hex_address_unique?(hex_address)
notifies :restart, 'service[tinc]'
end

tinc_private_key = "/etc/tinc/#{node['tinc']['net']}/rsa_key.priv"

# Generate the host's private key
execute "tincd -n #{node['tinc']['net']} -K 4096 < /dev/null" do
creates tinc_private_key
end

file "/etc/tinc/#{node['tinc']['net']}/hosts/#{node['tinc']['name']}" do
content <<EOF
Address = #{node['tinc']['address']}
Subnet = #{node['tinc']['ipv4_address']}
Subnet = #{node['tinc']['ipv6_address']}

#{OpenSSL::PKey::RSA.new(File.read(tinc_private_key)).public_key.to_s if File.exists?(tinc_private_key)}
EOF
action :create_if_missing
mode '0644'
owner 'root'
group 'root'
end

file "/etc/tinc/#{node['tinc']['net']}/tinc-up" do
Expand All @@ -90,9 +101,6 @@ def hex_address_unique?(hex_address)
notifies :restart, 'service[tinc]'
end

execute "tincd -n #{node['tinc']['net']} -K 4096 < /dev/null" do
creates "/etc/tinc/#{node['tinc']['net']}/rsa_key.priv"
end

file '/etc/tinc/nets.boot' do
content "#{node['tinc']['net']}\n"
Expand All @@ -114,7 +122,9 @@ def hex_address_unique?(hex_address)
next if peer_node.name == node.name
file "/etc/tinc/#{node['tinc']['net']}/hosts/#{peer_node['tinc']['name']}" do
content peer_node['tinc']['host_file']
mode 0600
mode '0644'
owner 'root'
group 'root'
end
connect_to << peer_node['tinc']['name']
end
Expand All @@ -129,6 +139,12 @@ def hex_address_unique?(hex_address)
end

service 'tinc' do
case node['platform_family']
when 'arch'
service_name "tincd@#{node['tinc']['net']}"
else
service_name 'tinc'
end
action [:enable, :start]
end

Expand Down