mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport syslogd service definition/control to RELENG_2_3. Ticket #4382

Browse Source 
(cherry picked from commit 5917696ded)
This commit is contained in:
jim-p 2017-05-17 10:57:02 -04:00
parent c564c8b34c
commit eb3bee5016
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/etc/inc/service-utils.inc
View File

@ -20,13 +20,15 @@
* limitations under the License.
*/
require_once("globals.inc");
require_once("captiveportal.inc");
require_once("openvpn.inc");
require_once("globals.inc");
require_once("gwlb.inc");
require_once("ipsec.inc");
require_once("openvpn.inc");
require_once("system.inc");
require_once("util.inc");
require_once("vpn.inc");
require_once("vslb.inc");
require_once("gwlb.inc");
define("RCFILEPREFIX", "/usr/local/etc/rc.d/");
function write_rcfile($params) {
@ -261,6 +263,11 @@ function get_services() {
$pconfig['description'] = gettext("NTP clock sync");
$services[] = $pconfig;
$pconfig = array();
$pconfig['name'] = "syslogd";
$pconfig['description'] = gettext("System Logger Daemon");
$services[] = $pconfig;
if (is_array($config['captiveportal'])) {
foreach ($config['captiveportal'] as $zone => $setting) {
if (isset($setting['enable'])) {
@ -620,6 +627,9 @@ function service_control_start($name, $extras) {
relayd_configure();
filter_configure();
break;
case 'syslogd':
system_syslogd_start();
break;
default:
start_service($name);
break;
@ -690,6 +700,16 @@ function service_control_stop($name, $extras) {
case 'relayd':
mwexec('pkill relayd');
break;
case 'syslogd':
if (isvalidpid("{$g['varrun_path']}/syslog.pid")) {
sigkillbypid("{$g['varrun_path']}/syslog.pid", "TERM");
usleep(100000);
}
if (isvalidpid("{$g['varrun_path']}/syslog.pid")) {
sigkillbypid("{$g['varrun_path']}/syslog.pid", "KILL");
usleep(100000);
}
break;
default:
stop_service($name);
break;
@ -760,6 +780,9 @@ function service_control_restart($name, $extras) {
relayd_configure(true);
filter_configure();
break;
case 'syslogd':
system_syslogd_start();
break;
default:
restart_service($name);
break;

5
src/usr/local/www/shortcuts.inc
View File

@ -295,6 +295,11 @@ $shortcuts['snmp'] = array();
$shortcuts['snmp']['main'] = "services_snmp.php";
$shortcuts['snmp']['service'] = "bsnmpd";
$shortcuts['syslogd'] = array();
$shortcuts['syslogd']['main'] = "status_logs_settings.php";
$shortcuts['syslogd']['log'] = "status_logs.php";
$shortcuts['syslogd']['service'] = "syslogd";
$shortcuts['authentication'] = array();
$shortcuts['authentication']['main'] = "system_authservers.php";
// $shortcuts['authentication']['status'] = "diag_authentication.php";