From 79023a65f24b86a3fd357a3db7d3cb60e34852a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= <greg@karekinian.com>
Date: Tue, 23 Apr 2019 11:40:33 +0200
Subject: [PATCH] Move the environment variables to an EnvironmentFile

---
 .../kredits-github/recipes/default.rb         | 24 ++++++++++++++-----
 .../default/nodejs.systemd.service.erb        |  4 +---
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/site-cookbooks/kredits-github/recipes/default.rb b/site-cookbooks/kredits-github/recipes/default.rb
index d452416..a79626f 100644
--- a/site-cookbooks/kredits-github/recipes/default.rb
+++ b/site-cookbooks/kredits-github/recipes/default.rb
@@ -41,6 +41,7 @@ user deploy_user do
 end
 
 path_to_deploy = "/opt/#{app_name}"
+environment_file = "/home/deploy/.kredits-github_environment"
 application path_to_deploy do
   owner deploy_user
   group deploy_group
@@ -66,6 +67,22 @@ application path_to_deploy do
     owner deploy_user
     group deploy_group
     mode '0440'
+    sensitive true
+  end
+
+  env = {
+    'LOG_LEVEL'        => "info",
+    'APP_ID'           => credentials['app_id'],
+    'PRIVATE_KEY_PATH' => "#{path_to_deploy}/github_app_key.pem",
+    'WEBHOOK_SECRET'   => credentials['webhook_secret'],
+  }
+
+  file environment_file do
+    content env.sort.map {|k, v| "#{k}=#{v}" }.join("\n")
+    owner deploy_user
+    owner deploy_group
+    mode '0440'
+    sensitive true
   end
 
   template "/lib/systemd/system/#{app_name}.service" do
@@ -78,12 +95,7 @@ application path_to_deploy do
       group: deploy_group,
       app_dir: path_to_deploy,
       entry: "/usr/bin/node /usr/bin/npm start",
-      environment: {
-        'LOG_LEVEL'        => "info",
-        'APP_ID'           => credentials['app_id'],
-        'PRIVATE_KEY_PATH' => "#{path_to_deploy}/github_app_key.pem",
-        'WEBHOOK_SECRET'   => credentials['webhook_secret'],
-      }
+      environment_file: environment_file
     )
     notifies :run, "execute[systemctl daemon-reload]", :delayed
     notifies :restart, "service[#{app_name}]", :delayed
diff --git a/site-cookbooks/kredits-github/templates/default/nodejs.systemd.service.erb b/site-cookbooks/kredits-github/templates/default/nodejs.systemd.service.erb
index 68f7a05..fb11e4b 100644
--- a/site-cookbooks/kredits-github/templates/default/nodejs.systemd.service.erb
+++ b/site-cookbooks/kredits-github/templates/default/nodejs.systemd.service.erb
@@ -6,9 +6,7 @@ ExecStart=<%= @entry %>
 WorkingDirectory=<%= @app_dir %>
 User=<%= @user %>
 Group=<%= @group %>
-<% unless @environment.empty? -%>
-Environment=<% @environment.each do |key, value| -%>'<%= key %>=<%= value %>' <% end %>
-<% end -%>
+EnvironmentFile=<%= @environment_file %>
 Restart=always
 
 [Install]