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

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

diff --git a/site-cookbooks/kredits-github/recipes/default.rb b/site-cookbooks/kredits-github/recipes/default.rb
index a79626f..d452416 100644
--- a/site-cookbooks/kredits-github/recipes/default.rb
+++ b/site-cookbooks/kredits-github/recipes/default.rb
@@ -41,7 +41,6 @@ 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
@@ -67,22 +66,6 @@ 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
@@ -95,7 +78,12 @@ application path_to_deploy do
       group: deploy_group,
       app_dir: path_to_deploy,
       entry: "/usr/bin/node /usr/bin/npm start",
-      environment_file: environment_file
+      environment: {
+        'LOG_LEVEL'        => "info",
+        'APP_ID'           => credentials['app_id'],
+        'PRIVATE_KEY_PATH' => "#{path_to_deploy}/github_app_key.pem",
+        'WEBHOOK_SECRET'   => credentials['webhook_secret'],
+      }
     )
     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 fb11e4b..68f7a05 100644
--- a/site-cookbooks/kredits-github/templates/default/nodejs.systemd.service.erb
+++ b/site-cookbooks/kredits-github/templates/default/nodejs.systemd.service.erb
@@ -6,7 +6,9 @@ ExecStart=<%= @entry %>
 WorkingDirectory=<%= @app_dir %>
 User=<%= @user %>
 Group=<%= @group %>
-EnvironmentFile=<%= @environment_file %>
+<% unless @environment.empty? -%>
+Environment=<% @environment.each do |key, value| -%>'<%= key %>=<%= value %>' <% end %>
+<% end -%>
 Restart=always
 
 [Install]