Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed port syslog-ng #174

Merged
merged 1 commit into from
Aug 19, 2016
Merged

Fixed port syslog-ng #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sysutils/pfSense-pkg-syslog-ng/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= pfSense-pkg-syslog-ng
PORTVERSION= 1.1.2
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
2 changes: 1 addition & 1 deletion sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ function syslogng_get_log_files($objects) {
function syslogng_build_conf($objects) {
$conf = "# This file is automatically generated by pfSense\n";
$conf .= "# Do not edit manually !\n";
$conf .= "@version:3.6\n";
$conf .= "@version:3.7\n";

foreach ($objects as $object) {
if ($object['objecttype'] == 'log' || $object['objecttype'] == 'options') {
Expand Down
2 changes: 1 addition & 1 deletion sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</tab>
<tab>
<text>Advanced</text>
<url>/pkg.php?xml=syslog-ng_advanced.xml</url>
<url>/pkg_edit.php?xml=syslog-ng_advanced.xml</url>
</tab>
<tab>
<text>Log Viewer</text>
Expand Down
2 changes: 1 addition & 1 deletion sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng_advanced.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</tab>
<tab>
<text>Advanced</text>
<url>/pkg.php?xml=syslog-ng_advanced.xml</url>
<url>/pkg_edit.php?xml=syslog-ng_advanced.xml</url>
<active/>
</tab>
<tab>
Expand Down
35 changes: 24 additions & 11 deletions sysutils/pfSense-pkg-syslog-ng/files/usr/local/www/syslog-ng_log_viewer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,30 @@
}
}

$pgtitle = "Services: Syslog-ng Log Viewer";
$pgtitle = array(gettext("Package"), gettext("Services: Syslog-ng"), gettext("Logs"));

include("head.inc");
?>

<?php include("fbegin.inc"); ?>
<?php if ($savemsg) print_info_box($savemsg); ?>

<style>

.border-bottom {
border: 1px solid #F5F5F5; border-width: 0px 0 3px 0px;
}

</style>


<form action="syslog-ng_log_viewer.php" method="post" name="iform">
<table width="99%" border="0" cellpadding="0" cellspacing="0">
<table width="100%" border="0" cellpadding="0" cellspacing="0" style="background-color: #F5F5F5;">
<tr><td>
<?php
$tab_array = array();
$tab_array[] = array("General", false, "/pkg_edit.php?xml=syslog-ng.xml&amp;id=0");
$tab_array[] = array("Advanced", false, "/pkg.php?xml=syslog-ng_advanced.xml");
$tab_array[] = array("Advanced", false, "/pkg_edit.php?xml=syslog-ng_advanced.xml");
$tab_array[] = array("Log Viewer", true, "/syslog-ng_log_viewer.php");
display_top_tabs($tab_array);
?>
Expand All @@ -112,8 +124,9 @@
<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>

<table>
<tr><td width="22%">Log File</td><td width="78%"><select name="logfile">
<table width="100%" class="panel-default" style="background-color: #FFFFFF;">
<h2 class="panel-title" style="background-color: #424242; color: #FFFFFF; border: solid 5px #424242;">Syslog-ng Logs</h2>
<tr><td class="border-bottom" width="22%">Log File</td><td class="border-bottom" width="78%"><select name="logfile">
<?php
$log_files = syslogng_get_log_files($objects);
foreach($log_files as $log_file) {
Expand All @@ -125,7 +138,7 @@
}
?>
</select></td></tr>
<tr><td width="22%">Limit</td><td width="78%"><select name="limit">
<tr><td class="border-bottom" width="22%">Limit</td><td class="border-bottom" width="78%"><select name="limit">
<?php
$limit_options = array("10", "20", "50");
foreach($limit_options as $limit_option) {
Expand All @@ -137,8 +150,8 @@
}
?>
</select></td></tr>
<tr><td width="22%">Include Archives</td><td width="78%"><input type="checkbox" name="archives" <?php if($archives) echo " CHECKED"; ?> /></td></tr>
<tr><td colspan="2">
<tr><td class="border-bottom" width="22%">Include Archives</td><td class="border-bottom" width="78%"><input type="checkbox" name="archives" <?php if($archives) echo " CHECKED"; ?> /></td></tr>
<tr><td class="border-bottom" colspan="2">
<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
<?php
if(!empty($log_messages)) {
Expand All @@ -152,9 +165,9 @@
?>
</table>
</td></tr>
<tr><td width="22%">Filter</td><td width="78%"><input name="filter" value="<?=$filter?>" /></td></tr>
<tr><td width="22%">Inverse Filter (NOT)</td><td width="78%"><input type="checkbox" name="not" <?php if($not) echo " CHECKED"; ?> /></td></tr>
<tr><td colspan="2"><input type="submit" value="Refresh" /></td></tr>
<tr><td class="border-bottom" width="22%">Filter</td><td class="border-bottom" width="78%"><input name="filter" value="<?=$filter?>" /></td></tr>
<tr><td class="border-bottom" width="22%">Inverse Filter (NOT)</td><td class="border-bottom" width="78%"><input type="checkbox" name="not" <?php if($not) echo " CHECKED"; ?> /></td></tr>
<tr><td class="border-bottom" colspan="2"><input type="submit" value="Refresh" /></td></tr>
</table>

</td></tr>
Expand Down