Compare commits
No commits in common. "e0039447116e3f31a0134c3db4122cd8b94ff253" and "98e9c659f6a64976fd63b4dab7f08b71ed6297ad" have entirely different histories.
e003944711
...
98e9c659f6
5 changed files with 26 additions and 56 deletions
|
@ -1,32 +1,34 @@
|
||||||
pipeline:
|
pipeline:
|
||||||
publish:
|
publish:
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
settings:
|
registry: registry.nulo.in
|
||||||
registry: registry.nulo.in
|
repo: registry.nulo.in/sutty/ruby
|
||||||
username: sutty
|
tags:
|
||||||
repo: registry.nulo.in/sutty/ruby
|
- ${ALPINE_VERSION}-${RUBY_VERSION}.${RUBY_PATCH}
|
||||||
tags:
|
- latest
|
||||||
- ${ALPINE_VERSION}-${RUBY_VERSION}.${RUBY_PATCH}
|
build_args:
|
||||||
- latest
|
- RUBY_VERSION=${RUBY_VERSION}
|
||||||
build_args:
|
- RUBY_PATCH=${RUBY_PATCH}
|
||||||
- RUBY_VERSION=${RUBY_VERSION}
|
- ALPINE_VERSION=${ALPINE_VERSION}
|
||||||
- RUBY_PATCH=${RUBY_PATCH}
|
- BASE_IMAGE=registry.nulo.in/sutty/monit
|
||||||
- ALPINE_VERSION=${ALPINE_VERSION}
|
username: sutty
|
||||||
- BASE_IMAGE=registry.nulo.in/sutty/monit
|
|
||||||
purge: false
|
|
||||||
secrets:
|
secrets:
|
||||||
- docker_password
|
- docker_password
|
||||||
|
cache_from: registry.nulo.in/sutty/ruby:${ALPINE_VERSION}-${RUBY_VERSION}.${RUBY_PATCH}
|
||||||
when:
|
when:
|
||||||
branch: antifascista
|
branch: antifascista
|
||||||
event: push
|
event: push
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- ALPINE_VERSION: 3.13.9
|
- ALPINE_VERSION: 3.13.6
|
||||||
RUBY_VERSION: 2.7
|
RUBY_VERSION: 2.7
|
||||||
RUBY_PATCH: 5
|
RUBY_PATCH: 5
|
||||||
- ALPINE_VERSION: 3.14.5
|
- ALPINE_VERSION: 3.13.7
|
||||||
RUBY_VERSION: 2.7
|
RUBY_VERSION: 2.7
|
||||||
RUBY_PATCH: 5
|
RUBY_PATCH: 5
|
||||||
- ALPINE_VERSION: 3.15.3
|
- ALPINE_VERSION: 3.14.3
|
||||||
|
RUBY_VERSION: 2.7
|
||||||
|
RUBY_PATCH: 5
|
||||||
|
- ALPINE_VERSION: 3.15.0
|
||||||
RUBY_VERSION: 3.0
|
RUBY_VERSION: 3.0
|
||||||
RUBY_PATCH: 3
|
RUBY_PATCH: 3
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
ARG ALPINE_VERSION=3.13.6
|
ARG ALPINE_VERSION=3.13.6
|
||||||
ARG BASE_IMAGE=alpine
|
ARG BASE_IMAGE=alpine
|
||||||
|
ARG EMAIL=monit@sutty.nl
|
||||||
FROM ${BASE_IMAGE}:${ALPINE_VERSION} as build
|
FROM ${BASE_IMAGE}:${ALPINE_VERSION} as build
|
||||||
ARG RUBY_VERSION=2.7
|
ARG RUBY_VERSION=2.7
|
||||||
ARG RUBY_PATCH=5
|
ARG RUBY_PATCH=5
|
||||||
|
ENV EMAIL ${EMAIL:-monit@sutty.nl}
|
||||||
|
|
||||||
RUN apk add --no-cache ruby~${RUBY_VERSION}.${RUBY_PATCH} patch
|
RUN apk add --no-cache ruby~${RUBY_VERSION}.${RUBY_PATCH} patch
|
||||||
|
|
||||||
|
|
11
monitrc
11
monitrc
|
@ -5,16 +5,17 @@ set pidfile /run/monit.pid
|
||||||
set idfile /var/lib/monit/id
|
set idfile /var/lib/monit/id
|
||||||
set statefile /var/lib/monit/state
|
set statefile /var/lib/monit/state
|
||||||
set eventqueue basedir /var/lib/monit/events slots 100
|
set eventqueue basedir /var/lib/monit/events slots 100
|
||||||
|
set mailserver postfix
|
||||||
set limits { programoutput: 1 MB }
|
set limits { programoutput: 1 MB }
|
||||||
|
set alert @@EMAIL@@
|
||||||
|
|
||||||
|
set httpd port 2812
|
||||||
|
allow localhost
|
||||||
|
allow 172.0.0.0/8
|
||||||
|
|
||||||
check program nsupdate
|
check program nsupdate
|
||||||
with path "/usr/local/bin/nsupdate"
|
with path "/usr/local/bin/nsupdate"
|
||||||
every 1 cycle
|
every 1 cycle
|
||||||
if status = 0 then unmonitor
|
if status = 0 then unmonitor
|
||||||
|
|
||||||
check program zeroconf
|
|
||||||
with path "/usr/local/bin/zeroconf"
|
|
||||||
every 1 cycle
|
|
||||||
if status = 0 then unmonitor
|
|
||||||
|
|
||||||
include /etc/monit.d/*.conf
|
include /etc/monit.d/*.conf
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
set mmonit http://@@MMONIT@@/collector
|
|
||||||
set mailserver postfix port 25 using hostname @@HOSTNAME@@
|
|
||||||
|
|
||||||
set alert @@EMAIL@@
|
|
||||||
|
|
||||||
set mail-format {
|
|
||||||
from: Monit <@@EMAIL_FROM@@>
|
|
||||||
subject: $HOST
|
|
||||||
message: $ACTION $SERVICE -- $DATE: $DESCRIPTION.
|
|
||||||
}
|
|
||||||
|
|
||||||
set httpd port 2812
|
|
||||||
allow localhost
|
|
||||||
allow 172.0.0.0/8
|
|
||||||
allow "fd00:acab::/32"
|
|
||||||
allow @@CREDENTIALS@@
|
|
19
zeroconf.sh
19
zeroconf.sh
|
@ -1,19 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
test ! -f /etc/monit.d/zeroconf.conf || exit 0
|
|
||||||
|
|
||||||
test -n "${EMAIL}"
|
|
||||||
test -n "${EMAIL_FROM}"
|
|
||||||
test -n "${MMONIT}"
|
|
||||||
test -n "${CREDENTIALS}"
|
|
||||||
|
|
||||||
sed -re "s/@@EMAIL@@/${EMAIL}/" \
|
|
||||||
-e "s/@@EMAIL_FROM@@/${EMAIL_FROM}/" \
|
|
||||||
-e "s/@@HOSTNAME@@/${EMAIL_FROM#*@}/" \
|
|
||||||
-e "s/@@MMONIT@@/${MMONIT}/" \
|
|
||||||
-e "s/@@CREDENTIALS@@/${CREDENTIALS}/" \
|
|
||||||
/etc/zeroconf.conf > /etc/monit.d/zeroconf.conf
|
|
||||||
|
|
||||||
monit -t
|
|
||||||
monit reload
|
|
Loading…
Reference in a new issue