Skip to content

Commit 713b592

Browse files
committed
Use bosh-enable-monit-access if available and fallback to nftables setup
1 parent ce4e74b commit 713b592

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

stemcell_builder/stages/base_ubuntu_packages/apply.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ source $base_dir/etc/settings.bash
99
debs="libssl-dev lsof strace bind9-host dnsutils tcpdump iputils-arping \
1010
curl wget bison libreadline6-dev rng-tools \
1111
libxml2 libxml2-dev libxslt1.1 libxslt1-dev zip unzip \
12-
flex psmisc apparmor-utils iptables sysstat \
12+
flex psmisc apparmor-utils iptables nftables sysstat \
1313
rsync openssh-server traceroute libncurses5-dev quota \
1414
libaio1 gdb libcap2-bin libcap2-dev libbz2-dev \
1515
cmake uuid-dev libgcrypt-dev ca-certificates \
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
permit_monit_access() {
2-
/var/vcap/bosh/etc/bosh-enable-monit-access
2+
local vcap_uid
3+
vcap_uid="$(id -u vcap)"
4+
5+
if ! /var/vcap/bosh/etc/bosh-enable-monit-access "$vcap_uid" 2>/dev/null; then
6+
if nft list chain inet bosh_agent monit_access_jobs &>/dev/null; then
7+
if ! nft list chain inet bosh_agent monit_access_jobs 2>/dev/null | grep -q "skuid $vcap_uid"; then
8+
nft add rule inet bosh_agent monit_access_jobs \
9+
meta skuid "$vcap_uid" ip daddr 127.0.0.1 tcp dport 2822 accept
10+
fi
11+
fi
12+
fi
313
}

0 commit comments

Comments
 (0)