From 5bb34554a7327d643efda3d0c61423edb6d2f248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 3 May 2019 10:55:02 +0200 Subject: [PATCH] The nginx_certbot_site resource does nothing in the dev environment No need to check for the environment in recipes that use the resource Closes #54 --- site-cookbooks/kosmos-mediawiki/recipes/default.rb | 2 +- site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb | 2 ++ site-cookbooks/kredits-github/recipes/nginx.rb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb index 488f14d..9503785 100644 --- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb +++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb @@ -101,7 +101,7 @@ nginx_site server_name do action :enable end -nginx_certbot_site server_name unless node.chef_environment == "development" +nginx_certbot_site server_name # # Extensions diff --git a/site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb b/site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb index de6fc30..de17158 100644 --- a/site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb +++ b/site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb @@ -6,6 +6,8 @@ property :domain, String, name_property: true property :site, String action :create do + return if node.chef_environment == "development" + include_recipe "kosmos-nginx" domain = new_resource.domain diff --git a/site-cookbooks/kredits-github/recipes/nginx.rb b/site-cookbooks/kredits-github/recipes/nginx.rb index 1ebec48..54b576a 100644 --- a/site-cookbooks/kredits-github/recipes/nginx.rb +++ b/site-cookbooks/kredits-github/recipes/nginx.rb @@ -43,4 +43,4 @@ nginx_site server_name do action :enable end -nginx_certbot_site server_name unless node.chef_environment == "development" +nginx_certbot_site server_name