diff --git a/dockerfiles/rsyslog/Dockerfile b/dockerfiles/rsyslog/Dockerfile deleted file mode 100644 index 96ff42cc5c354d0ebd202dd43b94faca5fd7b0a2..0000000000000000000000000000000000000000 --- a/dockerfiles/rsyslog/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM debian:jessie - -ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && \ - apt-get install -q -y rsyslog && \ - rm -rf /var/lib/apt/lists/* - -ADD haproxy /etc/logrotate.d/haproxy -ADD postfix /etc/logrotate.d/postfix - -VOLUME [ "/dev", "/var/log" ] - -ENTRYPOINT [ "rsyslogd", "-n" ] - diff --git a/dockerfiles/rsyslog/haproxy b/dockerfiles/rsyslog/haproxy deleted file mode 100644 index 9bba22f0bf6529ddde8d4cb6a1a3579737bb5a97..0000000000000000000000000000000000000000 --- a/dockerfiles/rsyslog/haproxy +++ /dev/null @@ -1,14 +0,0 @@ -/var/log/haproxy*.log -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - reload rsyslog >/dev/null 2>&1 || true - endscript -} - diff --git a/dockerfiles/rsyslog/postfix b/dockerfiles/rsyslog/postfix deleted file mode 100644 index 79fdf3f80520c9f63d2f43b80e30d82495c48fec..0000000000000000000000000000000000000000 --- a/dockerfiles/rsyslog/postfix +++ /dev/null @@ -1,14 +0,0 @@ -/var/log/mail.* -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - reload rsyslog >/dev/null 2>&1 || true - endscript -} - diff --git a/fresh_install b/fresh_install index b81df9181a1333a474d95e45c0dc3bd6000ce4ef..5a7f40a749a38c783ec62c99260875b34c78b424 100644 --- a/fresh_install +++ b/fresh_install @@ -57,7 +57,6 @@ vi /etc/mdadm.conf MAILADDR my.email@gmail.com mdadm --create --verbose /dev/md0 --level=mirror --raid-devices=2 /dev/sdb /dev/sdc -docker pull indiepaas/rsyslog docker pull indiepaas/haproxy docker pull indiepaas/confd docker pull indiepaas/duplicity @@ -71,8 +70,6 @@ git clone https://github.com/indiepaas/IndiePaaS.git /data/indiehosters # Install unit-files cp /data/indiehosters/unit-files/* /etc/systemd/system && systemctl daemon-reload -systemctl enable rsyslog -systemctl start rsyslog systemctl enable confd systemctl start confd systemctl enable haproxy.path diff --git a/scripts/install.sh b/scripts/install.sh index e795ea75b4b5cd9626f814f9bdcb97cee7159296..84f53cad8f817b2980a18cc3cc579196cc9af9a7 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -2,7 +2,6 @@ /usr/bin/coreos-cloudinit --from-file=/var/lib/coreos-user_data -docker pull indiepaas/rsyslog docker pull indiepaas/haproxy docker pull indiepaas/confd docker pull indiepaas/duplicity @@ -16,8 +15,6 @@ git clone https://github.com/indiepaas/IndiePaaS.git /data/indiehosters # Install unit-files cp /data/indiehosters/unit-files/* /etc/systemd/system && systemctl daemon-reload -systemctl enable rsyslog -systemctl start rsyslog systemctl enable confd systemctl start confd systemctl enable haproxy.path diff --git a/unit-files/rsyslog.service b/unit-files/rsyslog.service deleted file mode 100644 index bc59fcef77b6d9a3303ddad592c7688a15d9f4d1..0000000000000000000000000000000000000000 --- a/unit-files/rsyslog.service +++ /dev/null @@ -1,27 +0,0 @@ -[Unit] -Description=%p - -# Requirements -Requires=docker.service - -# Dependency ordering -After=docker.service - -[Service] -Restart=always -RestartSec=20 -TimeoutStartSec=0 -ExecStartPre=-/usr/bin/docker kill %p -ExecStartPre=-/usr/bin/docker rm %p -ExecStart=/usr/bin/docker run \ - --rm \ - --name rsyslog \ - -v /data/runtime/dev:/dev \ - -v /data/runtime/log:/var/log \ - indiepaas/rsyslog -ExecReload=/usr/bin/docker restart %p -ExecStop=/usr/bin/docker stop %p - -[Install] -WantedBy=multi-user.target -