From 8c712e6ffa3d8c8c6432dae0437cb268d283f25a Mon Sep 17 00:00:00 2001
From: Kazuhiro MUSASHI <simoom634@yahoo.co.jp>
Date: Mon, 10 Jan 2022 16:24:16 +0900
Subject: [PATCH] Delete `/etc/nomad.d/datadir.hcl`.

---
 cookbooks/nomad/files/etc/nomad.d/datadir.hcl | 4 ----
 cookbooks/nomad/files/etc/nomad.d/server.hcl  | 3 +++
 cookbooks/nomad/setup.rb                      | 8 --------
 3 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 cookbooks/nomad/files/etc/nomad.d/datadir.hcl

diff --git a/cookbooks/nomad/files/etc/nomad.d/datadir.hcl b/cookbooks/nomad/files/etc/nomad.d/datadir.hcl
deleted file mode 100644
index 6d9a396..0000000
--- a/cookbooks/nomad/files/etc/nomad.d/datadir.hcl
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/nomad.d/server.hcl
-
-# data_dir tends to be environment specific.
-data_dir = "/opt/nomad/data/"
diff --git a/cookbooks/nomad/files/etc/nomad.d/server.hcl b/cookbooks/nomad/files/etc/nomad.d/server.hcl
index 385e208..7074a43 100644
--- a/cookbooks/nomad/files/etc/nomad.d/server.hcl
+++ b/cookbooks/nomad/files/etc/nomad.d/server.hcl
@@ -2,3 +2,6 @@ server {
   enabled          = true
   bootstrap_expect = 3
 }
+
+# data_dir tends to be environment specific.
+data_dir = "/opt/nomad/data/"
diff --git a/cookbooks/nomad/setup.rb b/cookbooks/nomad/setup.rb
index c9e7cb9..8ab7d2a 100644
--- a/cookbooks/nomad/setup.rb
+++ b/cookbooks/nomad/setup.rb
@@ -12,14 +12,6 @@ file '/etc/nomad.d/nomad.hcl' do
   action :delete
 end
 
-remote_file '/etc/nomad.d/datadir.hcl' do
-  owner 'nomad'
-  group 'nomad'
-  mode '664'
-
-  notifies :restart, 'service[nomad]'
-end
-
 if node['nomad']['manager']
   %w( server.hcl acl.hcl ).each do |conf|
     remote_file "/etc/nomad.d/#{conf}" do