Bläddra i källkod

fixed build bugs that show up in github.

rkeil 7 år sedan
förälder
incheckning
e55ccdae67

+ 1 - 1
server/src/main/java/password/pwm/svc/event/SyslogAuditService.java

@@ -83,7 +83,7 @@ public class SyslogAuditService {
 
     private final Configuration configuration;
     private final PwmApplication pwmApplication;
-    private static boolean cefEnabled = true;
+    private boolean cefEnabled = true;
 
     public SyslogAuditService(final PwmApplication pwmApplication)
             throws LocalDBException

+ 0 - 4
server/src/main/resources/password/pwm/i18n/PwmSetting.properties

@@ -223,8 +223,6 @@ Setting_Description_activateUser.writePreAttributes=Add actions @PwmAppName@ exe
 Setting_Description_audit.syslog.certificates=Import the TLS Certificate of syslog service.
 Setting_Description_audit.syslog.servers=Specify one or more entries of the connection information for the syslog audit servers. When configured, @PwmAppName@ forwards all audit events to the specified syslog server entered as the first entry. If the first one fails then the others will be tried until there is a successful delivery. The format is <b>&lt;protocol&gt;</b>,<b>&lt;address&gt;</b>,<b>&lt;port&gt;</b>.  The value for <b>&lt;protocol&gt;</b> can be either <\b>UDP</b>, <b>TCP</b> or <b>TLS</b>. We recommend that UDP is used in the list as the last option because UDP does not report a failure.<br/><br/>Examples\:<table><tr><td>Protocol</td><td>Address</td><td>Port</td><td>Setting</td><tr><tr><td>UDP</td><td>127.0.0.1</td><td>514</td><td>udp,127.0.0.1,514</td><tr><tr><td>TCP</td><td>central-syslog.example.com</td><td>514</td><td>tcp,central-syslog.example.com,514</td><tr><tr><td>TLS</td><td>secure-syslog.example.com</td><td>6514</td><td>tls,central-syslog.example.com,6514</td><tr></table>
 Setting_Description_audit.CommonEventFormat.enable=Enable using Common Event Format as the logging format.
-Setting_Description_audit.CommonEventFormat.certificates=Import the TLS Certificate of Common Event service.
-Setting_Description_audit.CommonEventFormat.servers=Specify one or more entries of the connection information for the Common Event audit servers. When configured, @PwmAppName@ forwards all audit events to the specified Common Event server entered as the first entry. If the first one fails then the others will be tried until there is a successful delivery. The format is <b>&lt;protocol&gt;</b>,<b>&lt;address&gt;</b>,<b>&lt;port&gt;</b>.  The value for <b>&lt;protocol&gt;</b> can be either <\b>UDP</b>, <b>TCP</b> or <b>TLS</b>. We recommend that UDP is used in the list as the last option because UDP does not report a failure.<br/><br/>Examples\:<table><tr><td>Protocol</td><td>Address</td><td>Port</td><td>Setting</td><tr><tr><td>UDP</td><td>127.0.0.1</td><td>514</td><td>udp,127.0.0.1,514</td><tr><tr><td>TCP</td><td>central-syslog.example.com</td><td>514</td><td>tcp,central-syslog.example.com,514</td><tr><tr><td>TLS</td><td>secure-syslog.example.com</td><td>6514</td><td>tls,central-syslog.example.com,6514</td><tr></table>
 Setting_Description_audit.system.eventList=Select system event types to record and act upon.
 Setting_Description_audit.user.eventList=Select user event types to record and act upon.
 Setting_Description_audit.userEvent.toAddress=Specify one or more email addresses that the system sends an email to when the User Audit events occur.
@@ -708,8 +706,6 @@ Setting_Label_activateUser.writePreAttributes=Activation Actions (Before Passwor
 Setting_Label_audit.syslog.certificates=Syslog Audit Server Certificates
 Setting_Label_audit.syslog.servers=Syslog Audit Server
 Setting_Label_audit.CommonEventFormat.enable=Common Event Format
-Setting_Label_audit.CommonEventFormat.certificates=Common Event Audit Server Certificates
-Setting_Label_audit.CommonEventFormat.servers=Common Event Audit Server
 Setting_Label_audit.system.eventList=System Audit Event Types
 Setting_Label_audit.user.eventList=User Audit Event Types
 Setting_Label_audit.userEvent.toAddress=User Audit Event Email Alerts