/[smecontribs]/rpms/bacula/contribs8/bacula-5.0.3-paths.patch
ViewVC logotype

Annotation of /rpms/bacula/contribs8/bacula-5.0.3-paths.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Mon Mar 14 14:49:41 2011 UTC (13 years, 2 months ago) by slords
Branch: MAIN
CVS Tags: bacula-5_0_3-1_el5_sme, HEAD
Align patches

1 slords 1.1 --- bacula-2.0.3/scripts/logwatch/logfile.bacula.conf.in.orig 2007-05-25 11:24:34.000000000 +0200
2     +++ bacula-2.0.3/scripts/logwatch/logfile.bacula.conf.in 2007-05-25 11:25:46.000000000 +0200
3     @@ -1,3 +1,3 @@
4     # What actual file? Defaults to LogPath if not absolute path....
5     -LogFile = @working_dir@/log
6     +LogFile = @localstatedir@/log/bacula/bacula.log
7    
8     --- bacula-2.0.3/scripts/logrotate.in.orig 2007-05-25 11:26:10.000000000 +0200
9     +++ bacula-2.0.3/scripts/logrotate.in 2007-05-25 11:26:54.000000000 +0200
10     @@ -6,7 +6,8 @@
11     #
12     # /etc/logrotate.d/bacula
13     #
14     -@working_dir@/log {
15     +@localstatedir@/log/bacula/*.log {
16     + noolddir
17     monthly
18     rotate 5
19     notifempty
20     --- bacula-3.0.1/src/dird/bacula-dir.conf.in.orig 2008-07-04 20:18:15.000000000 +0200
21     +++ bacula-3.0.1/src/dird/bacula-dir.conf.in 2009-05-20 14:05:31.000000000 +0200
22     @@ -261,7 +261,7 @@ Messages {
23     # time to time as it will grow indefinitely. However, it will
24     # also keep all your messages if they scroll off the console.
25     #
26     - append = "@working_dir@/log" = all, !skipped
27     + append = "@localstatedir@/log/bacula/bacula.log" = all, !skipped
28     catalog = all
29     }
30    
31     @@ -273,7 +273,7 @@ Messages {
32     mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r"
33     mail = @job_email@ = all, !skipped
34     console = all, !skipped, !saved
35     - append = "@working_dir@/log" = all, !skipped
36     + append = "@localstatedir@/log/bacula/bacula.log" = all, !skipped
37     }
38    
39     # Default pool definition
40     --- bacula-3.0.1/scripts/mtx-changer.in.orig 2008-07-18 10:44:03.000000000 +0200
41     +++ bacula-3.0.1/scripts/mtx-changer.in 2009-05-20 14:08:40.000000000 +0200
42     @@ -58,9 +58,9 @@
43     MTX=@MTX@
44    
45     if test ${debug_log} -ne 0 ; then
46     - touch @working_dir@/mtx.log
47     + touch @localstatedir@/log/bacula/mtx.log
48     fi
49     -dbgfile="@working_dir@/mtx.log"
50     +dbgfile="@localstatedir@/log/bacula/mtx.log"
51     debug() {
52     if test -f $dbgfile; then
53     echo "`date +\"%Y%m%d-%H:%M:%S\"` $*" >> $dbgfile
54     --- bacula-3.0.1/scripts/disk-changer.in.orig 2009-04-21 15:00:16.000000000 +0200
55     +++ bacula-3.0.1/scripts/disk-changer.in 2009-05-20 14:05:31.000000000 +0200
56     @@ -84,14 +84,15 @@
57     #
58    
59     wd=@working_dir@
60     +ld=@localstatedir@/log/bacula
61    
62     #
63     # log whats done
64     #
65     # to turn on logging, uncomment the following line
66     -#touch $wd/disk-changer.log
67     +#touch $ld/disk-changer.log
68     #
69     -dbgfile="$wd/disk-changer.log"
70     +dbgfile="$ld/disk-changer.log"
71     debug() {
72     if test -f $dbgfile; then
73     echo "`date +\"%Y%m%d-%H:%M:%S\"` $*" >> $dbgfile
74     --- bacula-2.0.3/scripts/bacula.desktop.gnome2.consolehelper.in.orig 2007-05-29 10:42:45.000000000 +0200
75     +++ bacula-2.0.3/scripts/bacula.desktop.gnome2.consolehelper.in 2007-05-29 10:42:51.000000000 +0200
76     @@ -2,7 +2,7 @@
77     Name=Bacula Console
78     Comment=Bacula Director Console
79     Icon=/usr/share/pixmaps/bacula.png
80     -Exec=/usr/bin/bgnome-console -c @sysconfdir@/bgnome-console.conf
81     +Exec=@sbindir@/bgconsole -c @sysconfdir@/bgnome-console.conf
82     Terminal=false
83     Type=Application
84     Encoding=UTF-8
85     --- bacula-2.0.3/scripts/wxconsole.desktop.consolehelper.in.orig 2007-05-29 09:55:28.000000000 +0200
86     +++ bacula-2.0.3/scripts/wxconsole.desktop.consolehelper.in 2007-05-29 09:56:31.000000000 +0200
87     @@ -2,7 +2,7 @@
88     Name=Bacula WX Console
89     Comment=Bacula Director Console
90     Icon=/usr/share/pixmaps/wxwin16x16.xpm
91     -Exec=/usr/bin/bwx-console -c @sysconfdir@/bwx-console.conf
92     +Exec=@sbindir@/bwxconsole -c @sysconfdir@/bwx-console.conf
93     Terminal=false
94     Type=Application
95     Encoding=UTF-8
96     --- bacula-2.2.6/scripts/bat.console_apps.in.orig 2007-12-08 11:36:41.000000000 +0100
97     +++ bacula-2.2.6/scripts/bat.console_apps.in 2007-12-08 11:36:50.000000000 +0100
98     @@ -1,3 +1,3 @@
99     USER=root
100     -PROGRAM=@sbindir@/bat
101     +PROGRAM=@sbindir@/bqt-console
102     SESSION=true
103     --- bacula-2.2.6/scripts/bat.desktop.consolehelper.in.orig 2007-12-08 11:32:06.000000000 +0100
104     +++ bacula-2.2.6/scripts/bat.desktop.consolehelper.in 2007-12-08 11:32:14.000000000 +0100
105     @@ -2,7 +2,7 @@
106     Name=Bacula Administration Tool
107     Comment=Bacula Director Console
108     Icon=/usr/share/pixmaps/bat_icon.png
109     -Exec=/usr/bin/bat -c @sysconfdir@/bat.conf
110     +Exec=@sbindir@/bat -c @sysconfdir@/bat.conf
111     Terminal=false
112     Type=Application
113     Encoding=UTF-8

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed