52 lines
2.7 KiB
Text
52 lines
2.7 KiB
Text
Index: install.rb
|
|
--- install.rb.orig
|
|
+++ install.rb
|
|
@@ -171,10 +171,10 @@ def prepare_installation
|
|
opts.on('--codedir[=OPTIONAL]', 'Installation directory for code files', 'Default /etc/puppetlabs/code') do |codedir|
|
|
InstallOptions.codedir = codedir
|
|
end
|
|
- opts.on('--vardir[=OPTIONAL]', 'Installation directory for var files', 'Default /opt/puppetlabs/puppet/cache') do |vardir|
|
|
+ opts.on('--vardir[=OPTIONAL]', 'Installation directory for var files', 'Default /var/puppetlabs/puppet/cache') do |vardir|
|
|
InstallOptions.vardir = vardir
|
|
end
|
|
- opts.on('--publicdir[=OPTIONAL]', 'Installation directory for public files such as the `last_run_summary.yaml` report', 'Default /opt/puppetlabs/puppet/public') do |publicdir|
|
|
+ opts.on('--publicdir[=OPTIONAL]', 'Installation directory for public files such as the `last_run_summary.yaml` report', 'Default /var/puppetlabs/puppet/public') do |publicdir|
|
|
InstallOptions.publicdir = publicdir
|
|
end
|
|
opts.on('--rundir[=OPTIONAL]', 'Installation directory for state files', 'Default /var/run/puppetlabs') do |rundir|
|
|
@@ -186,7 +186,7 @@ def prepare_installation
|
|
opts.on('--bindir[=OPTIONAL]', 'Installation directory for binaries', 'overrides RbConfig::CONFIG["bindir"]') do |bindir|
|
|
InstallOptions.bindir = bindir
|
|
end
|
|
- opts.on('--localedir[=OPTIONAL]', 'Installation directory for locale information', 'Default /opt/puppetlabs/puppet/share/locale') do |localedir|
|
|
+ opts.on('--localedir[=OPTIONAL]', 'Installation directory for locale information', 'Default /var/puppetlabs/puppet/share/locale') do |localedir|
|
|
InstallOptions.localedir = localedir
|
|
end
|
|
opts.on('--ruby[=OPTIONAL]', 'Ruby interpreter to use with installation', 'overrides ruby used to call install.rb') do |ruby|
|
|
@@ -262,7 +262,7 @@ def prepare_installation
|
|
elsif $operatingsystem == "windows"
|
|
vardir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "cache")
|
|
else
|
|
- vardir = "/opt/puppetlabs/puppet/cache"
|
|
+ vardir = "/var/puppetlabs/puppet/cache"
|
|
end
|
|
|
|
if not InstallOptions.publicdir.nil?
|
|
@@ -270,7 +270,7 @@ def prepare_installation
|
|
elsif $operatingsystem == "windows"
|
|
publicdir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "public")
|
|
else
|
|
- publicdir = "/opt/puppetlabs/puppet/public"
|
|
+ publicdir = "/var/puppetlabs/puppet/public"
|
|
end
|
|
|
|
if not InstallOptions.rundir.nil?
|
|
@@ -301,7 +301,7 @@ def prepare_installation
|
|
if $operatingsystem == "windows"
|
|
localedir = File.join(ENV['PROGRAMFILES'], "Puppet Labs", "Puppet", "puppet", "share", "locale")
|
|
else
|
|
- localedir = "/opt/puppetlabs/puppet/share/locale"
|
|
+ localedir = "/var/puppetlabs/puppet/share/locale"
|
|
end
|
|
end
|
|
|