delete the windows newline character

JIRA: COMPASS-7

Change-Id: Iffd549877b8cc50a995bdc59adf1f05c0fcb1d5e
Signed-off-by: baigk <baiguoku@huawei.com>

1 files changed, 67 insertions, 67 deletions

diff --git a/deploy/adapters/cobbler/snippets/preseed_rsyslog.conf b/deploy/adapters/cobbler/snippets/preseed_rsyslog.conf
index a772279c..11e77227 100644
--- a/deploy/adapters/cobbler/snippets/preseed_rsyslog.conf
+++ b/deploy/adapters/cobbler/snippets/preseed_rsyslog.conf
@@ -1,67 +1,67 @@
-cat << EOL > /etc/rsyslog.conf

-\#\#\#\# MODULES \#\#\#\##

- 

-\\$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)

-\\$ModLoad imfile

-

-\\$WorkDirectory /var/spool/rsyslog

-\\$ActionQueueType LinkedList

-\\$ActionQueueFileName srvrfwd

-\\$ActionResumeRetryCount -1

-\\$ActionQueueSaveOnShutDown on

-#if $getVar("compass_server", "") != ""

-\# *.* @@$compass_server:514

-#else

-\# *.* @@$server:514

-#end if

-

-\# Provides UDP syslog reception

-\#\\$ModLoad imudp

-\#\\$UDPServerRun 514

-

-\# Provides TCP syslog reception

-\\$ModLoad imtcp

-\\$InputTCPServerRun 514

-#set system_name = $getVar('system_name','')

-\\$LocalHostName $system_name

-

-\#\#\#\# GLOBAL DIRECTIVES \#\#\#\##

-

-\# Use default timestamp format

-\\$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat

-

-\# File syncing capability is disabled by default. This feature is usually not required,

-\# not useful and an extreme performance hit

-\#\\$ActionFileEnableSync on

-

-\# Include all config files in /etc/rsyslog.d/

-\\$IncludeConfig /etc/rsyslog.d/*.conf

-

-

-\#\#\#\# RULES \#\#\#\##

-

-\# Log anything (except mail) of level info or higher.

-\# Don't log private authentication messages!

-syslog.*,daemon.*                                       /var/log/messages

-

-\# The authpriv file has restricted access.

-authpriv.*                                              /var/log/secure

-

-\# Log all the mail messages in one place.

-mail.*                                                  -/var/log/maillog

-

-\# Log cron stuff

-cron.*                                                  /var/log/cron

-

-\# Everybody gets emergency messages

-*.emerg                                                 *

-

-\# Save news errors of level crit and higher in a special file.

-uucp,news.crit                                          /var/log/spooler

-

-\# Save boot messages also to boot.log

-local7.*                                                /var/log/boot.log

-

-EOL

-

-update-rc.d rsyslog defaults 12 88

+cat << EOL > /etc/rsyslog.conf
+\#\#\#\# MODULES \#\#\#\##
+
+\\$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
+\\$ModLoad imfile
+
+\\$WorkDirectory /var/spool/rsyslog
+\\$ActionQueueType LinkedList
+\\$ActionQueueFileName srvrfwd
+\\$ActionResumeRetryCount -1
+\\$ActionQueueSaveOnShutDown on
+#if $getVar("compass_server", "") != ""
+\# *.* @@$compass_server:514
+#else
+\# *.* @@$server:514
+#end if
+
+\# Provides UDP syslog reception
+\#\\$ModLoad imudp
+\#\\$UDPServerRun 514
+
+\# Provides TCP syslog reception
+\\$ModLoad imtcp
+\\$InputTCPServerRun 514
+#set system_name = $getVar('system_name','')
+\\$LocalHostName $system_name
+
+\#\#\#\# GLOBAL DIRECTIVES \#\#\#\##
+
+\# Use default timestamp format
+\\$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+
+\# File syncing capability is disabled by default. This feature is usually not required,
+\# not useful and an extreme performance hit
+\#\\$ActionFileEnableSync on
+
+\# Include all config files in /etc/rsyslog.d/
+\\$IncludeConfig /etc/rsyslog.d/*.conf
+
+
+\#\#\#\# RULES \#\#\#\##
+
+\# Log anything (except mail) of level info or higher.
+\# Don't log private authentication messages!
+syslog.*,daemon.*                                       /var/log/messages
+
+\# The authpriv file has restricted access.
+authpriv.*                                              /var/log/secure
+
+\# Log all the mail messages in one place.
+mail.*                                                  -/var/log/maillog
+
+\# Log cron stuff
+cron.*                                                  /var/log/cron
+
+\# Everybody gets emergency messages
+*.emerg                                                 *
+
+\# Save news errors of level crit and higher in a special file.
+uucp,news.crit                                          /var/log/spooler
+
+\# Save boot messages also to boot.log
+local7.*                                                /var/log/boot.log
+
+EOL
+
+update-rc.d rsyslog defaults 12 88