From: Andy Witter <awitter@georgialibraries.org>
Date: Thu, 21 Sep 2017 17:12:56 +0000 (-0400)
Subject: work on getting nginx logging to logger
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=16be6a0fceb219aa2ec267433f72e1f4fa2788d6;p=contrib%2Fpines%2Fgenasys.git

work on getting nginx logging to logger
---

diff --git a/templates/rsyslog/60-evergreen-ils.conf b/templates/rsyslog/60-evergreen-ils.conf
index 9850d18..c3782e2 100755
--- a/templates/rsyslog/60-evergreen-ils.conf
+++ b/templates/rsyslog/60-evergreen-ils.conf
@@ -5,5 +5,6 @@ local0.*        @@LoggerHostName.CLUSTER_DOMAINNAME:514
 local1.*        @@LoggerHostName.CLUSTER_DOMAINNAME:514
 local2.*        @@LoggerHostName.CLUSTER_DOMAINNAME:514
 local3.*        @@LoggerHostName.CLUSTER_DOMAINNAME:514
+local4.*	@@LoggerHostName.CLUSTER_DOMAINNAME:514
 local6.*        @@LoggerHostName.CLUSTER_DOMAINNAME:514
 local7.*        @@LoggerHostName.CLUSTER_DOMAINNAME:514
diff --git a/templates/rsyslog/opensrf-rsyslog.conf b/templates/rsyslog/opensrf-rsyslog.conf
index c6618f6..631910e 100755
--- a/templates/rsyslog/opensrf-rsyslog.conf
+++ b/templates/rsyslog/opensrf-rsyslog.conf
@@ -17,8 +17,11 @@ $template router,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/router.log"
 #$template pg,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/pg.%$HOUR%.log"
 $template pg,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/pg.%HOSTNAME%.%$HOUR%.log"
 $template ap_access,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/ap_access.%$HOUR%.log"
-$template ap_warn,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/ap_error.%$HOUR%.log"
+$template ap_warn,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/ap_warn.%$HOUR%.log"
 $template ap_error,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/ap_error.%$HOUR%.log"
+$template ngx_access,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/ngx_access.%$HOUR%.log"
+$template ngx_warn,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/ngx_warn.%$HOUR%.log"
+$template ngx_error,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/ngx_error.%$HOUR%.log"
 $template maillog,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/mail_info.%$HOUR%.log"
 $template mail_info,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/mail_info.%$HOUR%.log"
 $template mail_warn,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/mail_warn.%$HOUR%.log"
@@ -38,6 +41,7 @@ local0.* ?osrfsys;msgformat
 local1.* ?activity;msgformat
 local2.* ?router;msgformat
 local3.* ?pg;msgformat
+local4.* ?ngx_access;msgformat
 local6.* ?gateway;msgformat
 local7.* ?ap_access;msgformat
 mail.* ?maillog;msgformat
@@ -48,6 +52,7 @@ local0.warn ?osrfwarn;msgformat
 local1.warn ?osrfwarn;msgformat
 local2.warn ?osrfwarn;msgformat
 local3.warn ?osrfwarn;msgformat
+local4.warn ?ngx_warn;msgformat
 local6.warn ?osrfwarn;msgformat
 local7.warn ?ap_warn;msgformat
 mail.warn ?mail_warn;msgformat
@@ -57,6 +62,7 @@ local0.error ?osrferror;msgformat
 local1.error ?osrferror;msgformat
 local2.error ?osrferror;msgformat
 local3.error ?osrferror;msgformat
+local4.error ?ngx_error;msgformat
 local6.error ?osrferror;msgformat
 local7.error ?ap_error;msgformat
 mail.err ?mail_error;msgformat
diff --git a/templates/rsyslog/rsyslog.conf-logger b/templates/rsyslog/rsyslog.conf-logger
old mode 100755
new mode 100644
index 10ed5cf..350a54a
--- a/templates/rsyslog/rsyslog.conf-logger
+++ b/templates/rsyslog/rsyslog.conf-logger
@@ -10,18 +10,20 @@
 #### MODULES ####
 #################
 
-$ModLoad imuxsock # provides support for local system logging
-$ModLoad imklog   # provides kernel logging support (previously done by rklogd)
-#$ModLoad immark  # provides --MARK-- message capability
+module(load="imuxsock") # provides support for local system logging
+module(load="imklog")   # provides kernel logging support
+#module(load="immark")  # provides --MARK-- message capability
 
 # provides UDP syslog reception
-$ModLoad imudp
-$UDPServerRun 514
+module(load="imudp")
+input(type="imudp" port="514")
 
 # provides TCP syslog reception
-$ModLoad imtcp
-$InputTCPServerRun 514
+module(load="imtcp")
+input(type="imtcp" port="514")
 
+# Enable non-kernel facility klog messages
+$KLogPermitNonKernelFacility on
 
 ###########################
 #### GLOBAL DIRECTIVES ####
@@ -44,11 +46,11 @@ $FileGroup adm
 $FileCreateMode 0640
 $DirCreateMode 0755
 $Umask 0022
-#$PrivDropToUser syslog
-#$PrivDropToGroup adm
+$PrivDropToUser syslog
+$PrivDropToGroup syslog
 
 #
-# Where to place spool files
+# Where to place spool and state files
 #
 $WorkDirectory /var/spool/rsyslog
 
@@ -56,4 +58,3 @@ $WorkDirectory /var/spool/rsyslog
 # Include all config files in /etc/rsyslog.d/
 #
 $IncludeConfig /etc/rsyslog.d/*.conf
-
diff --git a/templates/rsyslog/rsyslog.conf-logger-old b/templates/rsyslog/rsyslog.conf-logger-old
new file mode 100755
index 0000000..10ed5cf
--- /dev/null
+++ b/templates/rsyslog/rsyslog.conf-logger-old
@@ -0,0 +1,59 @@
+#  /etc/rsyslog.conf    Configuration file for rsyslog.
+#
+#                       For more information see
+#                       /usr/share/doc/rsyslog-doc/html/rsyslog_conf.html
+#
+#  Default logging rules can be found in /etc/rsyslog.d/50-default.conf
+
+
+#################
+#### MODULES ####
+#################
+
+$ModLoad imuxsock # provides support for local system logging
+$ModLoad imklog   # provides kernel logging support (previously done by rklogd)
+#$ModLoad immark  # provides --MARK-- message capability
+
+# provides UDP syslog reception
+$ModLoad imudp
+$UDPServerRun 514
+
+# provides TCP syslog reception
+$ModLoad imtcp
+$InputTCPServerRun 514
+
+
+###########################
+#### GLOBAL DIRECTIVES ####
+###########################
+
+#
+# Use traditional timestamp format.
+# To enable high precision timestamps, comment out the following line.
+#
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+
+# Filter duplicated messages
+$RepeatedMsgReduction on
+
+#
+# Set the default permissions for all log files.
+#
+$FileOwner syslog
+$FileGroup adm
+$FileCreateMode 0640
+$DirCreateMode 0755
+$Umask 0022
+#$PrivDropToUser syslog
+#$PrivDropToGroup adm
+
+#
+# Where to place spool files
+#
+$WorkDirectory /var/spool/rsyslog
+
+#
+# Include all config files in /etc/rsyslog.d/
+#
+$IncludeConfig /etc/rsyslog.d/*.conf
+