Line 0
Link Here
|
|
|
1 |
--- ./tasks/install.rake.orig 2014-02-06 18:04:53.000000000 +0000 |
2 |
+++ ./tasks/install.rake 2014-03-06 09:20:38.000000000 +0000 |
3 |
@@ -16,22 +16,16 @@ |
4 |
mkdir_p "#{DESTDIR}/#{@config_dir}" |
5 |
mkdir_p "#{DESTDIR}/#{@config_dir}/.." |
6 |
mkdir_p "#{DESTDIR}/#{@log_dir}" |
7 |
- mkdir_p "#{DESTDIR}/etc/init.d/" |
8 |
mkdir_p "#{DESTDIR}/#{@lib_dir}" |
9 |
mkdir_p "#{DESTDIR}/#{@libexec_dir}" |
10 |
mkdir_p "#{DESTDIR}/#{@sbin_dir}" |
11 |
mkdir_p "#{DESTDIR}/etc/logrotate.d/" |
12 |
- ln_sf @config_dir, "#{DESTDIR}/#{@lib_dir}/config" |
13 |
- ln_sf @log_dir, "#{DESTDIR}/#{@install_dir}/log" |
14 |
|
15 |
unless @pe |
16 |
- mkdir_p "#{DESTDIR}/var/lib/puppetdb/state" |
17 |
- mkdir_p "#{DESTDIR}/var/lib/puppetdb/db" |
18 |
- mkdir_p "#{DESTDIR}/var/lib/puppetdb/mq" |
19 |
- ln_sf "#{@lib_dir}/state", "#{DESTDIR}#{@link}/state" |
20 |
- ln_sf "#{@lib_dir}/db", "#{DESTDIR}#{@link}/db" |
21 |
- ln_sf "#{@lib_dir}/mq", "#{DESTDIR}#{@link}/mq" |
22 |
- mkdir_p "#{DESTDIR}/etc/puppetdb" |
23 |
+ mkdir_p "#{DESTDIR}#{@lib_dir}/state" |
24 |
+ mkdir_p "#{DESTDIR}#{@lib_dir}/db" |
25 |
+ mkdir_p "#{DESTDIR}#{@lib_dir}/mq" |
26 |
+ mkdir_p "#{DESTDIR}#{@etc_dir}" |
27 |
else |
28 |
mkdir_p "#{DESTDIR}#{@lib_dir}/state" |
29 |
mkdir_p "#{DESTDIR}#{@lib_dir}/db" |
30 |
@@ -40,19 +34,15 @@ |
31 |
end |
32 |
|
33 |
cp_p JAR_FILE, "#{DESTDIR}/#{@install_dir}" |
34 |
- cp_pr "ext/files/config.ini", "#{DESTDIR}/#{@config_dir}" |
35 |
- cp_pr "ext/files/database.ini", "#{DESTDIR}/#{@config_dir}" |
36 |
- cp_pr "ext/files/jetty.ini", "#{DESTDIR}/#{@config_dir}" |
37 |
- cp_pr "ext/files/repl.ini", "#{DESTDIR}/#{@config_dir}" |
38 |
+ cp_pr "ext/files/config.ini", "#{DESTDIR}/#{@config_dir}/config.ini.sample" |
39 |
+ cp_pr "ext/files/database.ini", "#{DESTDIR}/#{@config_dir}/database.ini.sample" |
40 |
+ cp_pr "ext/files/jetty.ini", "#{DESTDIR}/#{@config_dir}/jetty.ini.sample" |
41 |
+ cp_pr "ext/files/repl.ini", "#{DESTDIR}/#{@config_dir}/repl.ini.sample" |
42 |
cp_pr "ext/files/puppetdb.logrotate", "#{DESTDIR}/etc/logrotate.d/#{@name}" |
43 |
cp_pr "ext/files/log4j.properties", "#{DESTDIR}/#{@config_dir}/.." |
44 |
cp_pr "ext/files/puppetdb", "#{DESTDIR}/#{@sbin_dir}" |
45 |
|
46 |
- # Copy legacy wrapper for deprecated hyphenated sub-commands |
47 |
legacy_cmds=%w|puppetdb-ssl-setup puppetdb-foreground puppetdb-import puppetdb-export puppetdb-anonymize| |
48 |
- legacy_cmds.each do |file| |
49 |
- cp_pr "ext/files/puppetdb-legacy", "#{DESTDIR}/#{@sbin_dir}/#{file}" |
50 |
- end |
51 |
|
52 |
# Copy internal sub-commands to libexec location |
53 |
internal_cmds=legacy_cmds |
54 |
@@ -93,15 +83,14 @@ |
55 |
mkdir_p "#{DESTDIR}/etc/rc.d/" |
56 |
cp_p "ext/files/puppetdb.openbsd.init", "#{DESTDIR}/etc/rc.d/#{@name}.rc" |
57 |
chmod 0755, "#{DESTDIR}/etc/rc.d/#{@name}.rc" |
58 |
+ elsif @osfamily == "freebsd" |
59 |
+ #mkdir_p "#{DESTDIR}/usr/local/etc/rc.d/" |
60 |
+ #cp_p "ext/files/puppetdb.openbsd.init", "#{DESTDIR}/etc/rc.d/#{@name}.rc" |
61 |
+ #chmod 0755, "#{DESTDIR}/etc/rc.d/#{@name}.rc" |
62 |
else |
63 |
raise "Unknown or unsupported osfamily: #{@osfamily}" |
64 |
end |
65 |
chmod 0750, "#{DESTDIR}/#{@config_dir}" |
66 |
chmod 0640, "#{DESTDIR}/#{@config_dir}/../log4j.properties" |
67 |
- chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-ssl-setup" |
68 |
- chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-foreground" |
69 |
- chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-import" |
70 |
- chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-export" |
71 |
- chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-anonymize" |
72 |
chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb" |
73 |
end |