Skip to content

Commit

Permalink
Don't create unused SERVICE/etc dirs for erlang services
Browse files Browse the repository at this point in the history
Nothing lives in the etc/ directories since the move to rebar3.
  • Loading branch information
stevendanna committed Nov 6, 2015
1 parent 7137a4f commit 143b818
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

cookbook_migration = "/opt/opscode/embedded/bin/cookbook_migration.sh"

checksum_path = node['private_chef']['opscode-chef']['checksum_path']
data_path = node['private_chef']['bookshelf']['data_dir']

template cookbook_migration do
Expand All @@ -21,12 +20,10 @@
# Note that data_path will not be a subdir of bookshelf_dir in HA configurations
#
bookshelf_dir = node['private_chef']['bookshelf']['dir']
bookshelf_etc_dir = File.join(bookshelf_dir, "etc")
bookshelf_log_dir = node['private_chef']['bookshelf']['log_directory']
bookshelf_sasl_log_dir = File.join(bookshelf_log_dir, "sasl")
[
bookshelf_dir,
bookshelf_etc_dir,
bookshelf_log_dir,
bookshelf_sasl_log_dir,
data_path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,11 @@

oc_bifrost_dir = node['private_chef']['oc_bifrost']['dir']
oc_bifrost_bin_dir = File.join(oc_bifrost_dir, "bin")
oc_bifrost_etc_dir = File.join(oc_bifrost_dir, "etc")
oc_bifrost_log_dir = node['private_chef']['oc_bifrost']['log_directory']
oc_bifrost_sasl_log_dir = File.join(oc_bifrost_log_dir, "sasl")
[
oc_bifrost_dir,
oc_bifrost_bin_dir,
oc_bifrost_etc_dir,
oc_bifrost_log_dir,
oc_bifrost_sasl_log_dir
].each do |dir_name|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@
# All Rights Reserved

opscode_erchef_dir = node['private_chef']['opscode-erchef']['dir']
opscode_erchef_etc_dir = File.join(opscode_erchef_dir, "etc")
opscode_erchef_log_dir = node['private_chef']['opscode-erchef']['log_directory']
opscode_erchef_sasl_log_dir = File.join(opscode_erchef_log_dir, "sasl")
[
opscode_erchef_dir,
opscode_erchef_etc_dir,
opscode_erchef_log_dir,
opscode_erchef_sasl_log_dir
].each do |dir_name|
Expand Down

0 comments on commit 143b818

Please sign in to comment.