kosmos/chef
kosmos/chef
8
3
Fork 0
Code Issues 30 Pull Requests 3 Projects 2 Activity

Use variable instead of hardcoding domain

Browse Source 
The domain name is hardcoded exactly 12 times in just the letsencrypt
recipe.
This commit is contained in:
Basti 2019-03-15 12:37:20 +07:00
parent c3135402ad
commit a77580d6da
No known key found for this signature in database
GPG Key ID: BE4634D632D39B67
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
site-cookbooks/kosmos-ipfs/attributes/default.rb
View File

@ -1,3 +1,8 @@
# Override to connect to the IPFS cluster proxy on port 9095 # Override to connect to the IPFS cluster proxy on port 9095
# (https://cluster.ipfs.io/documentation/composite-clusters/) # (https://cluster.ipfs.io/documentation/composite-clusters/)
# FIXME api_port should come from the ipfs cookbook/attributes
# It has nothing to do with nginx
node.default['kosmos-ipfs']['nginx']['api_port'] = 5001 node.default['kosmos-ipfs']['nginx']['api_port'] = 5001
node.default['kosmos-ipfs']['nginx']['domain'] = "ipfs.kosmos.org"

24
site-cookbooks/kosmos-ipfs/recipes/letsencrypt.rb
View File

@ -14,7 +14,7 @@ end
include_recipe "kosmos-nginx" include_recipe "kosmos-nginx"
root_directory = "/var/www/ipfs.kosmos.org" root_directory = "/var/www/#{node["kosmos-ipfs"]["nginx"]["domain"]}"
directory "#{root_directory}/.well-known/acme-challenge" do directory "#{root_directory}/.well-known/acme-challenge" do
owner node["nginx"]["user"] owner node["nginx"]["user"]
@ -23,21 +23,21 @@ directory "#{root_directory}/.well-known/acme-challenge" do
recursive true recursive true
end end
template "#{node['nginx']['dir']}/sites-available/ipfs.kosmos.org" do template "#{node['nginx']['dir']}/sites-available/#{node["kosmos-ipfs"]["nginx"]["domain"]}" do
source 'nginx_conf_ipfs.kosmos.org.erb' source "nginx_conf_#{node["kosmos-ipfs"]["nginx"]["domain"]}.erb"
owner 'www-data' owner 'www-data'
mode 0640 mode 0640
variables server_name: 'ipfs.kosmos.org', variables server_name: node["kosmos-ipfs"]["nginx"]["domain"],
root_directory: root_directory, root_directory: root_directory,
ssl_cert: "/etc/letsencrypt/live/ipfs.kosmos.org/fullchain.pem", ssl_cert: "/etc/letsencrypt/live/#{node["kosmos-ipfs"]["nginx"]["domain"]}/fullchain.pem",
ssl_key: "/etc/letsencrypt/live/ipfs.kosmos.org/privkey.pem", ssl_key: "/etc/letsencrypt/live/#{node["kosmos-ipfs"]["nginx"]["domain"]}/privkey.pem",
ipfs_api_port: node['kosmos-ipfs']['nginx']['api_port'], ipfs_api_port: node['kosmos-ipfs']['nginx']['api_port'],
ipfs_external_api_port: 5444 ipfs_external_api_port: 5444
notifies :reload, 'service[nginx]', :delayed notifies :reload, 'service[nginx]', :delayed
end end
nginx_site 'ipfs.kosmos.org' do nginx_site node["kosmos-ipfs"]["nginx"]["domain"] do
enable true enable true
end end
@ -51,12 +51,12 @@ unless node.chef_environment == "development"
# Generate a Let's Encrypt cert (only if the nginx vhost exists and no cert # Generate a Let's Encrypt cert (only if the nginx vhost exists and no cert
# has been generated before. The renew cron will take care of renewing # has been generated before. The renew cron will take care of renewing
execute "letsencrypt cert for ipfs.kosmos.org" do execute "letsencrypt cert for #{node["kosmos-ipfs"]["nginx"]["domain"]}" do
command "/usr/bin/certbot certonly --webroot --agree-tos --email ops@5apps.com --webroot-path #{root_directory} -d ipfs.kosmos.org -n" command "/usr/bin/certbot certonly --webroot --agree-tos --email ops@5apps.com --webroot-path #{root_directory} -d #{node["kosmos-ipfs"]["nginx"]["domain"]} -n"
only_if do only_if do
File.exist?("#{node['nginx']['dir']}/sites-enabled/ipfs.kosmos.org") && File.exist?("#{node['nginx']['dir']}/sites-enabled/#{node["kosmos-ipfs"]["nginx"]["domain"]}") &&
!File.exist?("/etc/letsencrypt/live/ipfs.kosmos.org/fullchain.pem") !File.exist?("/etc/letsencrypt/live/#{node["kosmos-ipfs"]["nginx"]["domain"]}/fullchain.pem")
end end
notifies :create, "template[#{node['nginx']['dir']}/sites-available/ipfs.kosmos.org]", :delayed notifies :create, "template[#{node['nginx']['dir']}/sites-available/#{node["kosmos-ipfs"]["nginx"]["domain"]}]", :delayed
end end
end end