diff options
| author | Marc Chamberland <chamberland.marc@gmail.com> | 2019-11-05 13:24:56 -0500 |
|---|---|---|
| committer | Marc Chamberland <chamberland.marc@gmail.com> | 2019-12-05 08:47:17 -0500 |
| commit | e1a8a9d22f587e514b208d747d86a64979bad8db (patch) | |
| tree | 182138f38a05c4dd8cef8a7d74f5366ab242fa05 /lib/chef/application | |
| parent | 1befa58bc9340040028aeee3f6368f0e014b9366 (diff) | |
| download | chef-e1a8a9d22f587e514b208d747d86a64979bad8db.tar.gz | |
inserting distro constants into windows service messages
Signed-off-by: Marc Chamberland <chamberland.marc@gmail.com>
Diffstat (limited to 'lib/chef/application')
| -rw-r--r-- | lib/chef/application/windows_service.rb | 4 | ||||
| -rw-r--r-- | lib/chef/application/windows_service_manager.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb index 04a8812efc..aeded0bc45 100644 --- a/lib/chef/application/windows_service.rb +++ b/lib/chef/application/windows_service.rb @@ -40,7 +40,7 @@ class Chef option :config_file, short: "-c CONFIG", long: "--config CONFIG", - default: "#{ENV["SYSTEMDRIVE"]}/chef/client.rb", + default: "#{Chef::Config::etc_chef_dir}/client.rb", description: "The configuration file to use for #{Chef::Dist::PRODUCT} runs." option :log_location, @@ -60,7 +60,7 @@ class Chef description: "Set the number of seconds to wait between #{Chef::Dist::PRODUCT} runs.", proc: lambda { |s| s.to_i } - DEFAULT_LOG_LOCATION ||= "#{ENV["SYSTEMDRIVE"]}/chef/client.log".freeze + DEFAULT_LOG_LOCATION ||= "#{Chef::Config::c_chef_dir}/client.log".freeze def service_init @service_action_mutex = Mutex.new diff --git a/lib/chef/application/windows_service_manager.rb b/lib/chef/application/windows_service_manager.rb index a43c29d072..ac89da6dd7 100644 --- a/lib/chef/application/windows_service_manager.rb +++ b/lib/chef/application/windows_service_manager.rb @@ -41,18 +41,18 @@ class Chef short: "-a ACTION", long: "--action ACTION", default: "status", - description: "Action to carry out on chef-service (install, uninstall, status, start, stop, pause, or resume)." + description: "Action to carry out on #{Chef::Dist::SHORT}-service (install, uninstall, status, start, stop, pause, or resume)." option :config_file, short: "-c CONFIG", long: "--config CONFIG", - default: "#{ENV["SYSTEMDRIVE"]}/chef/client.rb", + default: "#{ChefConfig::Config::c_chef_dir}/client.rb", description: "The configuration file to use for #{Chef::Dist::PRODUCT} runs." option :log_location, short: "-L LOGLOCATION", long: "--logfile LOGLOCATION", - description: "Set the log file location for chef-service." + description: "Set the log file location for #{Chef::Dist::SHORT}-service." option :help, short: "-h", |