From d90056efe54b87fc08d00c15fde02ff0401203d8 Mon Sep 17 00:00:00 2001 From: kev Date: Sat, 28 Jul 2018 17:34:05 +0800 Subject: [PATCH] update rsyslog --- rsyslog/Dockerfile | 13 +++---------- rsyslog/README.md | 4 ++-- rsyslog/arm/Dockerfile | 13 +++---------- rsyslog/arm/docker-compose.yml | 1 + rsyslog/arm/rsyslog.conf | 10 ++++++++++ rsyslog/docker-compose.yml | 1 + rsyslog/rsyslog.conf | 10 ++++++++++ 7 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 rsyslog/arm/rsyslog.conf create mode 100644 rsyslog/rsyslog.conf diff --git a/rsyslog/Dockerfile b/rsyslog/Dockerfile index 47a31e3..4554d13 100644 --- a/rsyslog/Dockerfile +++ b/rsyslog/Dockerfile @@ -5,16 +5,9 @@ FROM alpine MAINTAINER kev -RUN set -xe \ - && apk add --no-cache rsyslog \ - && sed -i '/imklog/s/^/#/' /etc/rsyslog.conf \ - && { \ - echo '###Syslog Server####'; \ - echo 'module(load="imtcp")'; \ - echo 'module(load="imudp")'; \ - echo 'input(type="imtcp" port="514")'; \ - echo 'input(type="imudp" port="514")'; \ - } >> /etc/rsyslog.conf +RUN apk add --no-cache rsyslog + +COPY rsyslog.conf /etc/rsyslog.conf VOLUME /var/log WORKDIR /var/log diff --git a/rsyslog/README.md b/rsyslog/README.md index df3db81..3a03b3c 100644 --- a/rsyslog/README.md +++ b/rsyslog/README.md @@ -12,6 +12,7 @@ rsyslog: - "514:514/tcp" - "514:514/udp" volumes: + - ./rsyslog.conf:/etc/rsyslog.conf - ./data:/var/log restart: always ``` @@ -24,8 +25,7 @@ $ docker-compose up -d $ docker-compose exec rsyslog sh >>> pwd /var/log ->>> touch maillog ->>> tail -f /var/log/maillog +>>> tail -f /var/log/syslog 2016-10-29T08:17:34+00:00 172.17.0.1 root: hello 2016-10-29T08:17:41+00:00 172.17.0.1 root: world ^C diff --git a/rsyslog/arm/Dockerfile b/rsyslog/arm/Dockerfile index 0e0f459..29bf050 100644 --- a/rsyslog/arm/Dockerfile +++ b/rsyslog/arm/Dockerfile @@ -5,16 +5,9 @@ FROM easypi/alpine-arm MAINTAINER EasyPi Software Foundation -RUN set -xe \ - && apk add --no-cache rsyslog \ - && sed -i '/imklog/s/^/#/' /etc/rsyslog.conf \ - && { \ - echo '###Syslog Server####'; \ - echo 'module(load="imtcp")'; \ - echo 'module(load="imudp")'; \ - echo 'input(type="imtcp" port="514")'; \ - echo 'input(type="imudp" port="514")'; \ - } >> /etc/rsyslog.conf +RUN apk add --no-cache rsyslog + +COPY rsyslog.conf /etc/rsyslog.conf VOLUME /var/log WORKDIR /var/log diff --git a/rsyslog/arm/docker-compose.yml b/rsyslog/arm/docker-compose.yml index 41789fa..4ac1e5c 100644 --- a/rsyslog/arm/docker-compose.yml +++ b/rsyslog/arm/docker-compose.yml @@ -4,5 +4,6 @@ rsyslog: - "514:514/tcp" - "514:514/udp" volumes: + - ./rsyslogd.conf:/etc/rsyslogd.conf - ./data:/var/log restart: always diff --git a/rsyslog/arm/rsyslog.conf b/rsyslog/arm/rsyslog.conf new file mode 100644 index 0000000..43c0d7b --- /dev/null +++ b/rsyslog/arm/rsyslog.conf @@ -0,0 +1,10 @@ +#### Modules #### +module(load="imudp") # UDP listener support +module(load="imtcp") # TCP listener support + +#### LISTENERS #### +input(type="imudp" port="514") +input(type="imtcp" port="514") + +#### OUTPUTS #### +*.* action(type="omfile" file="/var/log/syslog") diff --git a/rsyslog/docker-compose.yml b/rsyslog/docker-compose.yml index 1911e78..c1466ff 100644 --- a/rsyslog/docker-compose.yml +++ b/rsyslog/docker-compose.yml @@ -4,5 +4,6 @@ rsyslog: - "514:514/tcp" - "514:514/udp" volumes: + - ./rsyslogd.conf:/etc/rsyslogd.conf - ./data:/var/log restart: always diff --git a/rsyslog/rsyslog.conf b/rsyslog/rsyslog.conf new file mode 100644 index 0000000..43c0d7b --- /dev/null +++ b/rsyslog/rsyslog.conf @@ -0,0 +1,10 @@ +#### Modules #### +module(load="imudp") # UDP listener support +module(load="imtcp") # TCP listener support + +#### LISTENERS #### +input(type="imudp" port="514") +input(type="imtcp" port="514") + +#### OUTPUTS #### +*.* action(type="omfile" file="/var/log/syslog")