]> TLD Linux GIT Repositories - packages/shorewall.git/blob - shorewall-logging.patch
- updated to 5.2.1.4
[packages/shorewall.git] / shorewall-logging.patch
1 diff -ur shorewall-5.2.1.orig/shorewall/configfiles/shorewall.conf shorewall-5.2.1/shorewall/configfiles/shorewall.conf
2 --- shorewall-5.2.1.orig/shorewall/configfiles/shorewall.conf   2018-10-11 21:39:19.903033000 +0000
3 +++ shorewall-5.2.1/shorewall/configfiles/shorewall.conf        2018-10-11 21:40:46.292033000 +0000
4 @@ -49,9 +49,9 @@
5  
6  LOGALLNEW=
7  
8 -LOGFILE=/var/log/messages
9 +LOGFILE=/var/log/shorewall
10  
11 -LOGFORMAT="%s %s "
12 +LOGFORMAT="Shorewall:%s:%s "
13  
14  LOGTAGONLY=No
15  
16 @@ -67,7 +67,7 @@
17  
18  SMURF_LOG_LEVEL="$LOG_LEVEL"
19  
20 -STARTUP_LOG=/var/log/shorewall-init.log
21 +STARTUP_LOG=/var/log/shorewall-init
22  
23  TCP_FLAGS_LOG_LEVEL="$LOG_LEVEL"
24  
25 diff -ur shorewall-5.2.1.orig/shorewall/install.sh shorewall-5.2.1/shorewall/install.sh
26 --- shorewall-5.2.1.orig/shorewall/install.sh   2018-10-02 15:21:54.000000000 +0000
27 +++ shorewall-5.2.1/shorewall/install.sh        2018-10-11 21:40:46.293033000 +0000
28 @@ -1223,8 +1223,8 @@
29  fi
30  
31  if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then
32 -    run_install $OWNERSHIP -m 0644 logrotate ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}
33 -    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}"
34 +    run_install $OWNERSHIP -m 0644 logrotate ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}-init
35 +    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}-init"
36  fi
37  
38  #
39 @@ -1262,7 +1262,7 @@
40             echo "${PRODUCT} will start automatically at boot"
41             if [ $HOST = debian ]; then
42                 echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable"
43 -               touch /var/log/${PRODUCT}-init.log
44 +               touch /var/log/${PRODUCT}-init
45                 perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf
46             else
47                 echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf to enable"
48 @@ -1281,7 +1281,7 @@
49      elif mywhich update-rc.d ; then
50         echo "${PRODUCT} will start automatically at boot"
51         echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable"
52 -       touch /var/log/${PRODUCT}-init.log
53 +       touch /var/log/${PRODUCT}-init
54         perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf
55         update-rc.d ${PRODUCT} enable
56      elif mywhich rc-update ; then
57 @@ -1289,7 +1289,7 @@
58             echo "${PRODUCT} will start automatically at boot"
59             if [ $HOST = debian ]; then
60                 echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable"
61 -               touch /var/log/${PRODUCT}-init.log
62 +               touch /var/log/${PRODUCT}-init
63                 perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf
64             else
65                 echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf to enable"
66 diff -ur shorewall-5.2.1.orig/shorewall/logrotate shorewall-5.2.1/shorewall/logrotate
67 --- shorewall-5.2.1.orig/shorewall/logrotate    2018-10-02 15:15:20.000000000 +0000
68 +++ shorewall-5.2.1/shorewall/logrotate 2018-10-11 21:40:46.293033000 +0000
69 @@ -1,4 +1,4 @@
70 -/var/log/shorewall-init.log {
71 +/var/log/shorewall-init {
72    missingok
73    notifempty
74    create 0600 root root
75 diff -ur shorewall-5.2.1.orig/shorewall/uninstall.sh shorewall-5.2.1/shorewall/uninstall.sh
76 --- shorewall-5.2.1.orig/shorewall/uninstall.sh 2018-10-02 15:21:54.000000000 +0000
77 +++ shorewall-5.2.1/shorewall/uninstall.sh      2018-10-11 21:40:46.293033000 +0000
78 @@ -216,7 +216,7 @@
79      esac
80  done
81  
82 -remove_file  ${CONFDIR}/logrotate.d/$PRODUCT
83 +remove_file  ${CONFDIR}/logrotate.d/$PRODUCT-init
84  
85  [ -n "$SYSTEMD" ] && remove_file ${SYSTEMD}/${PRODUCT}.service
86  
87 diff -ur shorewall-5.2.1.orig/shorewall6/configfiles/shorewall6.conf shorewall-5.2.1/shorewall6/configfiles/shorewall6.conf
88 --- shorewall-5.2.1.orig/shorewall6/configfiles/shorewall6.conf 2018-10-11 21:39:19.903033000 +0000
89 +++ shorewall-5.2.1/shorewall6/configfiles/shorewall6.conf      2018-10-11 21:40:46.293033000 +0000
90 @@ -48,9 +48,9 @@
91  
92  LOGALLNEW=
93  
94 -LOGFILE=/var/log/messages
95 +LOGFILE=/var/log/shorewall
96  
97 -LOGFORMAT="%s %s "
98 +LOGFORMAT="Shorewall:%s:%s "
99  
100  LOGLIMIT="s:1/sec:10"
101  
102 @@ -66,7 +66,7 @@
103  
104  SMURF_LOG_LEVEL="$LOG_LEVEL"
105  
106 -STARTUP_LOG=/var/log/shorewall6-init.log
107 +STARTUP_LOG=/var/log/shorewall6-init
108  
109  TCP_FLAGS_LOG_LEVEL="$LOG_LEVEL"
110  
111 diff -ur shorewall-5.2.1.orig/shorewall6/install.sh shorewall-5.2.1/shorewall6/install.sh
112 --- shorewall-5.2.1.orig/shorewall6/install.sh  2018-10-02 15:21:54.000000000 +0000
113 +++ shorewall-5.2.1/shorewall6/install.sh       2018-10-11 21:40:46.293033000 +0000
114 @@ -1223,8 +1223,8 @@
115  fi
116  
117  if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then
118 -    run_install $OWNERSHIP -m 0644 logrotate ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}
119 -    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}"
120 +    run_install $OWNERSHIP -m 0644 logrotate ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}-init
121 +    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/${PRODUCT}-init"
122  fi
123  
124  #
125 @@ -1262,7 +1262,7 @@
126             echo "${PRODUCT} will start automatically at boot"
127             if [ $HOST = debian ]; then
128                 echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable"
129 -               touch /var/log/${PRODUCT}-init.log
130 +               touch /var/log/${PRODUCT}-init
131                 perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf
132             else
133                 echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf to enable"
134 @@ -1281,7 +1281,7 @@
135      elif mywhich update-rc.d ; then
136         echo "${PRODUCT} will start automatically at boot"
137         echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable"
138 -       touch /var/log/${PRODUCT}-init.log
139 +       touch /var/log/${PRODUCT}-init
140         perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf
141         update-rc.d ${PRODUCT} enable
142      elif mywhich rc-update ; then
143 @@ -1289,7 +1289,7 @@
144             echo "${PRODUCT} will start automatically at boot"
145             if [ $HOST = debian ]; then
146                 echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable"
147 -               touch /var/log/${PRODUCT}-init.log
148 +               touch /var/log/${PRODUCT}-init
149                 perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf
150             else
151                 echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf to enable"
152 diff -ur shorewall-5.2.1.orig/shorewall6/logrotate shorewall-5.2.1/shorewall6/logrotate
153 --- shorewall-5.2.1.orig/shorewall6/logrotate   2018-10-02 15:15:20.000000000 +0000
154 +++ shorewall-5.2.1/shorewall6/logrotate        2018-10-11 21:40:46.294033000 +0000
155 @@ -1,4 +1,4 @@
156 -/var/log/shorewall6-init.log {
157 +/var/log/shorewall6-init {
158    missingok
159    notifempty
160    create 0600 root root
161 diff -ur shorewall-5.2.1.orig/shorewall6/uninstall.sh shorewall-5.2.1/shorewall6/uninstall.sh
162 --- shorewall-5.2.1.orig/shorewall6/uninstall.sh        2018-10-02 15:21:54.000000000 +0000
163 +++ shorewall-5.2.1/shorewall6/uninstall.sh     2018-10-11 21:40:46.294033000 +0000
164 @@ -216,7 +216,7 @@
165      esac
166  done
167  
168 -remove_file  ${CONFDIR}/logrotate.d/$PRODUCT
169 +remove_file  ${CONFDIR}/logrotate.d/$PRODUCT-init
170  
171  [ -n "$SYSTEMD" ] && remove_file ${SYSTEMD}/${PRODUCT}.service
172  
173 diff -ur shorewall-5.2.1.orig/shorewall6-lite/install.sh shorewall-5.2.1/shorewall6-lite/install.sh
174 --- shorewall-5.2.1.orig/shorewall6-lite/install.sh     2018-10-02 15:21:54.000000000 +0000
175 +++ shorewall-5.2.1/shorewall6-lite/install.sh  2018-10-11 21:40:46.294033000 +0000
176 @@ -467,8 +467,8 @@
177  fi
178  
179  if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then
180 -    install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT 0644
181 -    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT"
182 +    install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT-init 0644
183 +    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT-init"
184  fi
185  
186  #
187 @@ -518,7 +518,7 @@
188             echo "$PRODUCT will start automatically at boot"
189             if [ $HOST = debian ]; then
190                 echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable"
191 -               touch /var/log/$PRODUCT-init.log
192 +               touch /var/log/$PRODUCT-init
193                 perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf
194             else
195                 echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/$PRODUCT/$PRODUCT.conf to enable"
196 @@ -537,7 +537,7 @@
197      elif mywhich update-rc.d ; then
198         echo "$PRODUCT will start automatically at boot"
199         echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable"
200 -       touch /var/log/$PRODUCT-init.log
201 +       touch /var/log/$PRODUCT-init
202         perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf
203         update-rc.d $PRODUCT enable
204      elif mywhich rc-update ; then
205 @@ -545,7 +545,7 @@
206             echo "$PRODUCT will start automatically at boot"
207             if [ $HOST = debian ]; then
208                 echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable"
209 -               touch /var/log/$PRODUCT-init.log
210 +               touch /var/log/$PRODUCT-init
211                 perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf
212             else
213                 echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/$PRODUCT/$PRODUCT.conf to enable"
214 diff -ur shorewall-5.2.1.orig/shorewall6-lite/logrotate shorewall-5.2.1/shorewall6-lite/logrotate
215 --- shorewall-5.2.1.orig/shorewall6-lite/logrotate      2018-10-02 15:15:20.000000000 +0000
216 +++ shorewall-5.2.1/shorewall6-lite/logrotate   2018-10-11 21:40:46.294033000 +0000
217 @@ -1,4 +1,4 @@
218 -/var/log/shorewall6-lite-init.log {
219 +/var/log/shorewall6-lite-init {
220    missingok
221    notifempty
222    create 0600 root root
223 diff -ur shorewall-5.2.1.orig/shorewall6-lite/uninstall.sh shorewall-5.2.1/shorewall6-lite/uninstall.sh
224 --- shorewall-5.2.1.orig/shorewall6-lite/uninstall.sh   2018-10-02 15:21:54.000000000 +0000
225 +++ shorewall-5.2.1/shorewall6-lite/uninstall.sh        2018-10-11 21:40:46.294033000 +0000
226 @@ -190,7 +190,7 @@
227  remove_directory ${VARDIR}
228  remove_directory ${SHAREDIR}/$PRODUCT
229  remove_directory ${LIBEXECDIR}/$PRODUCT
230 -remove_file  ${CONFDIR}/logrotate.d/$PRODUCT
231 +remove_file  ${CONFDIR}/logrotate.d/$PRODUCT-init
232  
233  if [ -n "$SYSCONFDIR" ]; then
234      [ -n "$SYSCONFFILE" ] && remove_file ${SYSCONFDIR}/${PRODUCT}
235 diff -ur shorewall-5.2.1.orig/shorewall-init/install.sh shorewall-5.2.1/shorewall-init/install.sh
236 --- shorewall-5.2.1.orig/shorewall-init/install.sh      2018-10-02 15:21:54.000000000 +0000
237 +++ shorewall-5.2.1/shorewall-init/install.sh   2018-10-11 21:40:46.294033000 +0000
238 @@ -336,8 +336,8 @@
239  # Install logrotate file
240  #
241  if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then
242 -    install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT 0644
243 -    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT"
244 +    install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/shorewall-ifupdown 0644
245 +    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/shorewall-ifupdown"
246  fi
247  
248  #
249 diff -ur shorewall-5.2.1.orig/shorewall-init/logrotate shorewall-5.2.1/shorewall-init/logrotate
250 --- shorewall-5.2.1.orig/shorewall-init/logrotate       2018-10-02 15:15:20.000000000 +0000
251 +++ shorewall-5.2.1/shorewall-init/logrotate    2018-10-11 21:40:46.294033000 +0000
252 @@ -1,4 +1,4 @@
253 -/var/log/shorewall-ifupdown.log {
254 +/var/log/shorewall-ifupdown {
255    missingok
256    notifempty
257    create 0600 root root
258 diff -ur shorewall-5.2.1.orig/shorewall-init/sysconfig shorewall-5.2.1/shorewall-init/sysconfig
259 --- shorewall-5.2.1.orig/shorewall-init/sysconfig       2018-10-02 15:15:20.000000000 +0000
260 +++ shorewall-5.2.1/shorewall-init/sysconfig    2018-10-11 21:40:46.295033000 +0000
261 @@ -19,7 +19,7 @@
262  #
263  # Where Up/Down events get logged
264  #
265 -LOGFILE=/var/log/shorewall-ifupdown.log
266 +LOGFILE=/var/log/shorewall-ifupdown
267  
268  # Startup options - set verbosity to 0 (minimal reporting)
269  OPTIONS="-V0"
270 diff -ur shorewall-5.2.1.orig/shorewall-init/uninstall.sh shorewall-5.2.1/shorewall-init/uninstall.sh
271 --- shorewall-5.2.1.orig/shorewall-init/uninstall.sh    2018-10-02 15:21:54.000000000 +0000
272 +++ shorewall-5.2.1/shorewall-init/uninstall.sh 2018-10-11 21:40:46.295033000 +0000
273 @@ -202,7 +202,7 @@
274  
275  remove_directory ${SHAREDIR}/$PRODUCT
276  remove_directory ${LIBEXECDIR}/$PRODUCT
277 -remove_file  ${CONFDIR}/logrotate.d/$PRODUCT
278 +remove_file  ${CONFDIR}/logrotate.d/shorewall-ifupdown
279  
280  #
281  # Report Success
282 diff -ur shorewall-5.2.1.orig/shorewall-lite/install.sh shorewall-5.2.1/shorewall-lite/install.sh
283 --- shorewall-5.2.1.orig/shorewall-lite/install.sh      2018-10-02 15:21:54.000000000 +0000
284 +++ shorewall-5.2.1/shorewall-lite/install.sh   2018-10-11 21:40:46.295033000 +0000
285 @@ -467,8 +467,8 @@
286  fi
287  
288  if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then
289 -    install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT 0644
290 -    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT"
291 +    install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT-init 0644
292 +    echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT-init"
293  fi
294  
295  #
296 @@ -518,7 +518,7 @@
297             echo "$PRODUCT will start automatically at boot"
298             if [ $HOST = debian ]; then
299                 echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable"
300 -               touch /var/log/$PRODUCT-init.log
301 +               touch /var/log/$PRODUCT-init
302                 perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf
303             else
304                 echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/$PRODUCT/$PRODUCT.conf to enable"
305 @@ -537,7 +537,7 @@
306      elif mywhich update-rc.d ; then
307         echo "$PRODUCT will start automatically at boot"
308         echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable"
309 -       touch /var/log/$PRODUCT-init.log
310 +       touch /var/log/$PRODUCT-init
311         perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf
312         update-rc.d $PRODUCT enable
313      elif mywhich rc-update ; then
314 @@ -545,7 +545,7 @@
315             echo "$PRODUCT will start automatically at boot"
316             if [ $HOST = debian ]; then
317                 echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable"
318 -               touch /var/log/$PRODUCT-init.log
319 +               touch /var/log/$PRODUCT-init
320                 perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf
321             else
322                 echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/$PRODUCT/$PRODUCT.conf to enable"
323 diff -ur shorewall-5.2.1.orig/shorewall-lite/logrotate shorewall-5.2.1/shorewall-lite/logrotate
324 --- shorewall-5.2.1.orig/shorewall-lite/logrotate       2018-10-02 15:15:20.000000000 +0000
325 +++ shorewall-5.2.1/shorewall-lite/logrotate    2018-10-11 21:40:46.295033000 +0000
326 @@ -1,4 +1,4 @@
327 -/var/log/shorewall-lite-init.log {
328 +/var/log/shorewall-lite-init {
329    missingok
330    notifempty
331    create 0600 root root
332 diff -ur shorewall-5.2.1.orig/shorewall-lite/uninstall.sh shorewall-5.2.1/shorewall-lite/uninstall.sh
333 --- shorewall-5.2.1.orig/shorewall-lite/uninstall.sh    2018-10-02 15:21:54.000000000 +0000
334 +++ shorewall-5.2.1/shorewall-lite/uninstall.sh 2018-10-11 21:40:46.295033000 +0000
335 @@ -190,7 +190,7 @@
336  remove_directory ${VARDIR}
337  remove_directory ${SHAREDIR}/$PRODUCT
338  remove_directory ${LIBEXECDIR}/$PRODUCT
339 -remove_file  ${CONFDIR}/logrotate.d/$PRODUCT
340 +remove_file  ${CONFDIR}/logrotate.d/$PRODUCT-init
341  
342  if [ -n "$SYSCONFDIR" ]; then
343      [ -n "$SYSCONFFILE" ] && remove_file ${SYSCONFDIR}/${PRODUCT}