From: Giacomo Sanchietti Date: Tue, 21 Jun 2022 12:40:29 +0000 (+0200) Subject: rsyslog: replace spaces with tabs inside init X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=008860276e2772e54c72ee2466d8e09793abebac;p=feed%2Fpackages.git rsyslog: replace spaces with tabs inside init Signed-off-by: Giacomo Sanchietti --- diff --git a/admin/rsyslog/files/rsyslog.init b/admin/rsyslog/files/rsyslog.init index 8ad2c86a67..ef5f757fb0 100644 --- a/admin/rsyslog/files/rsyslog.init +++ b/admin/rsyslog/files/rsyslog.init @@ -21,84 +21,84 @@ selectors="" forwarders="" handle_selector() { - local config="$1" - local src - local dst - - config_get src "${config}" source - config_get dst "${config}" destination - if [ "${src}" != "" ] && [ "$dst" != "" ]; then - selectors="${selectors}\n${src}\t${dst}\n" - fi + local config="$1" + local src + local dst + + config_get src "${config}" source + config_get dst "${config}" destination + if [ "${src}" != "" ] && [ "$dst" != "" ]; then + selectors="${selectors}\n${src}\t${dst}\n" + fi } handle_forwarder() { - local config="$1" - local src - local target - local protocol - local port - local rfc - local opts - - config_get src "${config}" source - config_get target "${config}" target - config_get protocol "${config}" protocol "udp" - config_get port "${config}" port "514" - config_get rfc "${config}" rfc "3164" - - if [ "$rfc" == "5424" ]; then - opts='Template="RSYSLOG_SyslogProtocol23Format" TCP_Framing="octet-counted"' - fi - - if [ "${src}" != "" ] && [ "${target}" != "" ]; then - action="action(type=\"omfwd\" target=\"$target\" port=\"$port\" protocol=\"$protocol\" $opts action.resumeRetryCount=\"100\" queue.type=\"linkedList\" queue.size=\"10000\")" - forwarders="${forwarders}\n${src}\t${action}\n" - fi + local config="$1" + local src + local target + local protocol + local port + local rfc + local opts + + config_get src "${config}" source + config_get target "${config}" target + config_get protocol "${config}" protocol "udp" + config_get port "${config}" port "514" + config_get rfc "${config}" rfc "3164" + + if [ "$rfc" == "5424" ]; then + opts='Template="RSYSLOG_SyslogProtocol23Format" TCP_Framing="octet-counted"' + fi + + if [ "${src}" != "" ] && [ "${target}" != "" ]; then + action="action(type=\"omfwd\" target=\"$target\" port=\"$port\" protocol=\"$protocol\" $opts action.resumeRetryCount=\"100\" queue.type=\"linkedList\" queue.size=\"10000\")" + forwarders="${forwarders}\n${src}\t${action}\n" + fi } expand_config() { - local input_t="" - local input_u="" - - config_load "${UCI_CONF}" - config_list_foreach syslog modules handle_module - config_get_bool tcp_input syslog tcp_input - if [ "${tcp_input}" -eq 1 ]; then - modules="${modules} imtcp" - config_get tcp_port syslog tcp_input_port - input_t="input(type=\"imtcp\" port=\"${tcp_port}\")" - fi - - config_get_bool udp_input syslog udp_input - if [ "${udp_input}" -eq 1 ]; then - modules="${modules} imudp" - config_get udp_port syslog udp_input_port - input_u="input(type=\"imudp\" port=\"${udp_port}\")" - - fi - config_get template syslog default_template - config_foreach handle_selector selector - config_foreach handle_forwarder forwarder - - mkdir -p "$(dirname ${CONFIG_FILE})" - # shellcheck disable=SC2188 - > ${CONFIG_FILE} - echo "include(file=\"${BASE_CONFIG_FILE}\" mode=\"optional\")" >> ${CONFIG_FILE} - for m in ${modules}; do - echo "module(load=\"${m}\")" >> ${CONFIG_FILE} - done - echo "${input_t}" >> ${CONFIG_FILE} - echo "${input_u}" >> ${CONFIG_FILE} - echo "\$ActionFileDefaultTemplate ${template}" >> ${CONFIG_FILE} - echo -e "${selectors}" >> ${CONFIG_FILE} - echo -e "${forwarders}" >> ${CONFIG_FILE} + local input_t="" + local input_u="" + + config_load "${UCI_CONF}" + config_list_foreach syslog modules handle_module + config_get_bool tcp_input syslog tcp_input + if [ "${tcp_input}" -eq 1 ]; then + modules="${modules} imtcp" + config_get tcp_port syslog tcp_input_port + input_t="input(type=\"imtcp\" port=\"${tcp_port}\")" + fi + + config_get_bool udp_input syslog udp_input + if [ "${udp_input}" -eq 1 ]; then + modules="${modules} imudp" + config_get udp_port syslog udp_input_port + input_u="input(type=\"imudp\" port=\"${udp_port}\")" + + fi + config_get template syslog default_template + config_foreach handle_selector selector + config_foreach handle_forwarder forwarder + + mkdir -p "$(dirname ${CONFIG_FILE})" + # shellcheck disable=SC2188 + > ${CONFIG_FILE} + echo "include(file=\"${BASE_CONFIG_FILE}\" mode=\"optional\")" >> ${CONFIG_FILE} + for m in ${modules}; do + echo "module(load=\"${m}\")" >> ${CONFIG_FILE} + done + echo "${input_t}" >> ${CONFIG_FILE} + echo "${input_u}" >> ${CONFIG_FILE} + echo "\$ActionFileDefaultTemplate ${template}" >> ${CONFIG_FILE} + echo -e "${selectors}" >> ${CONFIG_FILE} + echo -e "${forwarders}" >> ${CONFIG_FILE} } handle_module() { - local module="$1" - modules="${modules} $module" + local module="$1" + modules="${modules} $module" } start_service() { @@ -111,5 +111,5 @@ start_service() { service_triggers() { - procd_add_reload_trigger ${UCI_CONF} + procd_add_reload_trigger ${UCI_CONF} }