Skip to content

Commit b17ffbc

Browse files
committed
syslogd: comment out syslogd activation in create and clone
1 parent 2c51586 commit b17ffbc

File tree

3 files changed

+43
-42
lines changed

3 files changed

+43
-42
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
2323
- inherit: it inherits the stack configured in pot.conf
2424
- alias: extend -i option to accept netif|ipaddr
2525
- alias: -i option can be repeated more than once to add more ip addresses to the same instance
26+
- syslogd: initial removal of syslogd forwarding
2627

2728
### Removed
2829
- alias: remove option -I, in favour of a more flexible and powerful -i

share/pot/clone.sh

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -195,28 +195,28 @@ _cj_conf()
195195
echo "bridge=$_bridge_name" >> "$_pdir/conf/pot.conf"
196196
;;
197197
esac
198-
if [ -n "$_ip" ]; then
199-
_ptype="$( _get_conf_var "$_pname" pot.type )"
200-
if [ "$_ptype" = "multi" ]; then
201-
_rc_conf="${_pdir}/custom/etc/rc.conf"
202-
else
203-
_rc_conf="${_pdir}/m/etc/rc.conf"
204-
fi
205-
touch "${_rc_conf}"
206-
sysrc -f "${_rc_conf}" "syslogd_flags=-vv -s -b $_ip" > /dev/null
207-
fi
208-
if [ "$_network_type" != "inherit" ]; then
209-
(
210-
echo +"$_ip"
211-
echo '*.* '"/var/log/pot/${_pname}.log"
212-
) > /usr/local/etc/syslog.d/"${_pname}".conf
213-
touch /var/log/pot/"${_pname}".log
214-
(
215-
echo "# log rotation for pot ${_pname}"
216-
echo "/var/log/pot/${_pname}.log 644 7 * @T00 CX"
217-
) > /usr/local/etc/newsyslog.conf.d/"${_pname}".conf
218-
service syslogd reload
219-
fi
198+
# if [ -n "$_ip" ]; then
199+
# _ptype="$( _get_conf_var "$_pname" pot.type )"
200+
# if [ "$_ptype" = "multi" ]; then
201+
# _rc_conf="${_pdir}/custom/etc/rc.conf"
202+
# else
203+
# _rc_conf="${_pdir}/m/etc/rc.conf"
204+
# fi
205+
# touch "${_rc_conf}"
206+
# sysrc -f "${_rc_conf}" "syslogd_flags=-vv -s -b $_ip" > /dev/null
207+
# fi
208+
# if [ "$_network_type" != "inherit" ]; then
209+
# (
210+
# echo +"$_ip"
211+
# echo '*.* '"/var/log/pot/${_pname}.log"
212+
# ) > /usr/local/etc/syslog.d/"${_pname}".conf
213+
# touch /var/log/pot/"${_pname}".log
214+
# (
215+
# echo "# log rotation for pot ${_pname}"
216+
# echo "/var/log/pot/${_pname}.log 644 7 * @T00 CX"
217+
# ) > /usr/local/etc/newsyslog.conf.d/"${_pname}".conf
218+
# service syslogd reload
219+
# fi
220220
}
221221

222222
# shellcheck disable=SC2039

share/pot/create.sh

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -373,26 +373,26 @@ _cj_internal_conf()
373373

374374
# TODO: to be verified
375375
# add remote syslogd capability, if not inherit
376-
if [ -n "$_ip" ]; then
377-
# configure syslog in the pot
378-
${SED} -i '' 's%^[^#].*/var/log.*$%# &%g' "${_etcdir}/syslog.conf"
379-
echo "*.* @${POT_GATEWAY}:514" > "${_etcdir}/syslog.d/pot.conf"
380-
if [ ! -r "${_etcdir}/rc.conf" ]; then
381-
touch "${_etcdir}/rc.conf"
382-
fi
383-
sysrc -f "${_etcdir}/rc.conf" "syslogd_flags=-vv -s -b $_ip" > /dev/null
384-
# configure syslogd in the host
385-
(
386-
echo +"$_ip"
387-
echo '*.* '"/var/log/pot/${_pname}.log"
388-
) > /usr/local/etc/syslog.d/"${_pname}".conf
389-
touch /var/log/pot/"${_pname}".log
390-
(
391-
echo "# log rotation for pot ${_pname}"
392-
echo "/var/log/pot/${_pname}.log 644 7 * @T00 CX"
393-
) > /usr/local/etc/newsyslog.conf.d/"${_pname}".conf
394-
service syslogd reload
395-
fi
376+
# if [ -n "$_ip" ]; then
377+
# # configure syslog in the pot
378+
# ${SED} -i '' 's%^[^#].*/var/log.*$%# &%g' "${_etcdir}/syslog.conf"
379+
# echo "*.* @${POT_GATEWAY}:514" > "${_etcdir}/syslog.d/pot.conf"
380+
# if [ ! -r "${_etcdir}/rc.conf" ]; then
381+
# touch "${_etcdir}/rc.conf"
382+
# fi
383+
# sysrc -f "${_etcdir}/rc.conf" "syslogd_flags=-vv -s -b $_ip" > /dev/null
384+
# # configure syslogd in the host
385+
# (
386+
# echo +"$_ip"
387+
# echo '*.* '"/var/log/pot/${_pname}.log"
388+
# ) > /usr/local/etc/syslog.d/"${_pname}".conf
389+
# touch /var/log/pot/"${_pname}".log
390+
# (
391+
# echo "# log rotation for pot ${_pname}"
392+
# echo "/var/log/pot/${_pname}.log 644 7 * @T00 CX"
393+
# ) > /usr/local/etc/newsyslog.conf.d/"${_pname}".conf
394+
# service syslogd reload
395+
# fi
396396
}
397397

398398
# Special version of set-cmd usable only for flavours

0 commit comments

Comments
 (0)