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

Make hubot nginx config generic

Browse Source
This commit is contained in:
Basti 2018-06-13 18:32:36 +02:00
parent 7165bf49c6
commit 4b30ce8b23
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
site-cookbooks/5apps-hubot/recipes/xmpp_schlupp.rb
View File

@ -8,6 +8,7 @@
# #
express_port = 8083 express_port = 8083
express_domain = "hubot.5apps.com"
unless node.chef_environment == "development" unless node.chef_environment == "development"
include_recipe "firewall" include_recipe "firewall"
@ -108,40 +109,42 @@ application schlupp_xmpp_path do
end end
end end
# nginx reverse proxy #
# Nginx reverse proxy
#
unless node.chef_environment == "development" unless node.chef_environment == "development"
include_recipe "kosmos-base::letsencrypt" include_recipe "kosmos-base::letsencrypt"
end end
include_recipe 'kosmos-nginx' include_recipe 'kosmos-nginx'
directory "/var/www/hubot.5apps.com/.well-known/acme-challenge" do directory "/var/www/#{express_domain}/.well-known/acme-challenge" do
owner node["nginx"]["user"] owner node["nginx"]["user"]
group node["nginx"]["group"] group node["nginx"]["group"]
recursive true recursive true
action :create action :create
end end
template "#{node['nginx']['dir']}/sites-available/hubot.5apps.com" do template "#{node['nginx']['dir']}/sites-available/#{express_domain}" do
source 'nginx_conf_hubot.5apps.com.erb' source 'nginx_conf_hubot.erb'
owner node["nginx"]["user"] owner node["nginx"]["user"]
mode 0640 mode 0640
variables express_port: express_port, variables express_port: express_port,
server_name: 'hubot.5apps.com', server_name: express_domain,
ssl_cert: "/etc/letsencrypt/live/hubot.5apps.com/fullchain.pem", ssl_cert: "/etc/letsencrypt/live/#{express_domain}/fullchain.pem",
ssl_key: "/etc/letsencrypt/live/hubot.5apps.com/privkey.pem" ssl_key: "/etc/letsencrypt/live/#{express_domain}/privkey.pem"
notifies :reload, 'service[nginx]', :delayed notifies :reload, 'service[nginx]', :delayed
end end
nginx_site 'hubot.5apps.com' do nginx_site express_domain do
enable true enable true
end end
unless node.chef_environment == "development" unless node.chef_environment == "development"
execute "letsencrypt cert for hubot.5apps.com" do execute "letsencrypt cert for #{express_domain}" do
command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path /var/www/hubot.5apps.com -d hubot.5apps.com -n" command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path /var/www/#{express_domain} -d #{express_domain} -n"
cwd "/usr/local/certbot" cwd "/usr/local/certbot"
not_if { File.exist? "/etc/letsencrypt/live/hubot.5apps.com/fullchain.pem" } not_if { File.exist? "/etc/letsencrypt/live/#{express_domain}/fullchain.pem" }
notifies :create, "template[#{node['nginx']['dir']}/sites-available/hubot.5apps.com]", :immediately notifies :create, "template[#{node['nginx']['dir']}/sites-available/#{express_domain}]", :immediately
end end
end end

15
site-cookbooks/5apps-hubot/templates/default/nginx_conf_hubot.5apps.com.erb → site-cookbooks/5apps-hubot/templates/default/nginx_conf_hubot.erb
View File

@ -1,14 +1,17 @@
#
# Generated by Chef # Generated by Chef
upstream _express_schlupp { #
upstream _express_<%= @server_name.gsub(".", "_") %> {
server localhost:<%= @express_port %>; server localhost:<%= @express_port %>;
} }
server { server {
listen 80; # For Let's Encrypt listen 80;
server_name <%= @server_name %>; server_name <%= @server_name %>;
# For Let's Encrypt ACME verification
location /.well-known { location /.well-known {
root "/var/www/hubot.5apps.com"; root "/var/www/<%= @server_name %>";
} }
location / { location / {
return 301 https://$host$request_uri; return 301 https://$host$request_uri;
@ -23,14 +26,14 @@ server {
server_name <%= @server_name %>; server_name <%= @server_name %>;
access_log <%= node[:nginx][:log_dir] %>/hubot.5apps.com.access.log json; access_log <%= node[:nginx][:log_dir] %>/<%= @server_name %>.access.log json;
error_log <%= node[:nginx][:log_dir] %>/hubot.5apps.com.error.log warn; error_log <%= node[:nginx][:log_dir] %>/<%= @server_name %>.error.log warn;
location / { location / {
# Increase number of buffers. Default is 8 # Increase number of buffers. Default is 8
proxy_buffers 1024 8k; proxy_buffers 1024 8k;
proxy_pass http://_express_schlupp; proxy_pass http://_express_<%= @server_name.gsub(".", "_") %>;
proxy_http_version 1.1; proxy_http_version 1.1;
} }