aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-08-03 09:52:44 -0300
committerRenato Botelho <renato@netgate.com>2015-08-03 09:52:44 -0300
commit67c43e72d5db6a76bcec6c12be80ea2a07102215 (patch)
tree62dab2adc49408782b53333e33efa4a3ca375901
parent0bc94c7ff0f8aba134f6b536e7b79a869cf025ed (diff)
parent50cb17b04cc62e7d01269287568f35ca9fd2a11d (diff)
downloadpfsense-packages-67c43e72d5db6a76bcec6c12be80ea2a07102215.tar.gz
pfsense-packages-67c43e72d5db6a76bcec6c12be80ea2a07102215.tar.bz2
pfsense-packages-67c43e72d5db6a76bcec6c12be80ea2a07102215.zip
Merge pull request #910 from doktornotor/patch-3
-rw-r--r--config/syslog-ng/syslog-ng.inc4
-rw-r--r--pkg_config.10.xml2
2 files changed, 4 insertions, 2 deletions
diff --git a/config/syslog-ng/syslog-ng.inc b/config/syslog-ng/syslog-ng.inc
index bbec3a7c..56decfad 100644
--- a/config/syslog-ng/syslog-ng.inc
+++ b/config/syslog-ng/syslog-ng.inc
@@ -69,6 +69,8 @@ function syslogng_deinstall_command() {
if (is_link("/usr/local/lib/syslog-ng"))
unlink_if_exists("/usr/local/lib/syslog-ng");
syslogng_install_cron(false);
+ unlink_if_exists("/usr/local/etc/logrotate.conf");
+ unlink_if_exists("/usr/local/etc/syslog-ng.conf");
conf_mount_ro();
filter_configure();
}
@@ -165,7 +167,7 @@ function syslogng_install_cron($should_install) {
$cron_item['month'] = "*";
$cron_item['wday'] = "*";
$cron_item['who'] = "root";
- $cron_item['command'] = "/usr/bin/nice -n20 /usr/local/sbin/logrotate /usr/local/etc/logrotate.conf";
+ $cron_item['command'] = "/usr/bin/nice -n20 " . SYSLOGNG_BASEDIR . "local/sbin/logrotate /usr/local/etc/logrotate.conf";
$config['cron']['item'][] = $cron_item;
$need_write = true;
}
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index af78f069..0b6fbe96 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1463,7 +1463,7 @@
<website>http://www.balabit.com/network-security/syslog-ng/</website>
<descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr>
<category>Services</category>
- <version>1.0.6</version>
+ <version>1.0.7</version>
<status>ALPHA</status>
<required_version>2.2</required_version>
<depends_on_package_pbi>syslog-ng-3.6.2_3-##ARCH##.pbi</depends_on_package_pbi>