diff --git a/image/Dockerfile b/image/Dockerfile index f72dde3..da5b41d 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 MAINTAINER Phusion COPY . /bd_build diff --git a/image/services/syslog-ng/syslog-ng.conf b/image/services/syslog-ng/syslog-ng.conf index 303596f..543eb05 100644 --- a/image/services/syslog-ng/syslog-ng.conf +++ b/image/services/syslog-ng/syslog-ng.conf @@ -1,14 +1,13 @@ -@version: 3.5 +@version: 3.13 @include "scl.conf" -@include "`scl-root`/system/tty10.conf" # Syslog-ng configuration file, compatible with default Debian syslogd # installation. # First, set some global options. options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); + owner("root"); group("adm"); perm(0640); stats_freq(0); + bad_hostname("^gconfd$"); }; ######################## @@ -80,7 +79,7 @@ destination d_stdout { ##SYSLOG_OUTPUT_MODE_DEV_STDOUT##("/dev/stdout"); }; ######################## # Filters ######################## -# Here's come the filter options. With this rules, we can set which +# Here's come the filter options. With this rules, we can set which # message go where. filter f_dbg { level(debug); }; @@ -92,7 +91,7 @@ filter f_crit { level(crit .. emerg); }; filter f_debug { level(debug) and not facility(auth, authpriv, news, mail); }; filter f_error { level(err .. emerg) ; }; -filter f_messages { level(info,notice,warn) and +filter f_messages { level(info,notice,warn) and not facility(auth,authpriv,cron,daemon,mail,news); }; filter f_auth { facility(auth, authpriv) and not filter(f_debug); }; @@ -134,6 +133,8 @@ log { source(s_src); filter(f_mail); destination(d_mail); }; log { source(s_src); filter(f_news); filter(f_crit); destination(d_newscrit); }; log { source(s_src); filter(f_news); filter(f_err); destination(d_newserr); }; log { source(s_src); filter(f_news); filter(f_notice); destination(d_newsnotice); }; +#log { source(s_src); filter(f_cnews); destination(d_console_all); }; +#log { source(s_src); filter(f_cother); destination(d_console_all); }; #log { source(s_src); filter(f_ppp); destination(d_ppp); }; diff --git a/image/utilities.sh b/image/utilities.sh index d1aa273..d8c9555 100755 --- a/image/utilities.sh +++ b/image/utilities.sh @@ -4,7 +4,7 @@ source /bd_build/buildconfig set -x ## Often used tools. -$minimal_apt_get_install curl less vim-tiny psmisc +$minimal_apt_get_install curl less vim-tiny psmisc gpg-agent dirmngr ln -s /usr/bin/vim.tiny /usr/bin/vim ## This tool runs a command as another user and sets $HOME.