Commit d066fb9d authored by Marian Babik's avatar Marian Babik
Browse files

abrt moved to etf-exp; crond shutdown fix; check_mk host config fix

parent e1c44cfc
...@@ -32,10 +32,6 @@ RUN yum -y install gfal2-all gfal2-python gfal2-util globus-ftp-client \ ...@@ -32,10 +32,6 @@ RUN yum -y install gfal2-all gfal2-python gfal2-util globus-ftp-client \
COPY docker/etf-cms/config/grid-env.sh /etc/profile.d/ COPY docker/etf-cms/config/grid-env.sh /etc/profile.d/
RUN echo "source /etc/profile.d/grid-env.sh" >> /opt/omd/sites/$CHECK_MK_SITE/.profile RUN echo "source /etc/profile.d/grid-env.sh" >> /opt/omd/sites/$CHECK_MK_SITE/.profile
# ABRTD
RUN yum -y install abrt
COPY docker/etf-cms/config/mailx_event.conf /etc/
# VOMS config # VOMS config
# RUN mkdir -p /etc/vomses/ # RUN mkdir -p /etc/vomses/
# COPY ./config/cms-lcg-voms2.cern.ch /etc/vomses/ # COPY ./config/cms-lcg-voms2.cern.ch /etc/vomses/
......
EVENT=notify
# do not rely on the default config nor on the config file
Mailx_Subject="[abrt] $(cat package || cat executable): $(cat crash_function && echo "():") $(cat reason || (cat executable && echo " crashed"))" \
Mailx_EmailFrom="ABRT Daemon <DoNotReply>" \
Mailx_EmailTo="root@localhost" \
reporter-mailx --notify-only
EVENT=notify-dup
# do not rely on the default config nor on the config file
Mailx_Subject="[abrt] $(cat package || cat executable): $(cat crash_function && echo "():") $(cat reason || (cat executable && echo " crashed"))" \
Mailx_EmailFrom="ABRT Daemon <DoNotReply>" \
Mailx_EmailTo="root@localhost" \
reporter-mailx --notify-only
...@@ -41,4 +41,4 @@ DEFAULT_CONTACT_GROUPS="check-mk-notify" ...@@ -41,4 +41,4 @@ DEFAULT_CONTACT_GROUPS="check-mk-notify"
DEFINE_HOSTGROUPS=True DEFINE_HOSTGROUPS=True
DEFINE_SERVICEGROUPS=True DEFINE_SERVICEGROUPS=True
DEFINE_CONTACTS=True DEFINE_CONTACTS=True
DNS_SERVER="8.8.8.8" DNS_SERVER="137.138.17.5"
...@@ -3,6 +3,10 @@ set -e ...@@ -3,6 +3,10 @@ set -e
_term() { _term() {
omd stop omd stop
if [ -f /var/run/crond.pid ]; then
kill -9 `cat /var/run/crond.pid`
rm -f /var/run/crond.pid
fi
rm -rf /opt/omd/sites/etf/etc/nagios/conf.d/wlcg/ rm -rf /opt/omd/sites/etf/etc/nagios/conf.d/wlcg/
} }
...@@ -71,7 +75,7 @@ echo "Configuring main.mk: $ETF_HOSTED_BY" ...@@ -71,7 +75,7 @@ echo "Configuring main.mk: $ETF_HOSTED_BY"
if [ -z "${ETF_HOSTED_BY}" ]; then if [ -z "${ETF_HOSTED_BY}" ]; then
echo " Variable ETF_HOSTED_BY is not defined, not touching main.mk" echo " Variable ETF_HOSTED_BY is not defined, not touching main.mk"
else else
echo "all_hosts += [ \"${ETF_HOSTED_BY}\" ]" >> /opt/omd/sites/$CHECK_MK_SITE/etc/check_mk/main.mk sed "s/all_hosts.*/all_hosts += [ \"${ETF_HOSTED_BY}\" ]/g" -i /opt/omd/sites/$CHECK_MK_SITE/etc/check_mk/main.mk
fi fi
echo "Configuring ETF ..." echo "Configuring ETF ..."
...@@ -95,7 +99,6 @@ fi ...@@ -95,7 +99,6 @@ fi
if [ "${ABRT_ENABLED}" -eq "1" ] ; then if [ "${ABRT_ENABLED}" -eq "1" ] ; then
echo "Enabling abrt ..." echo "Enabling abrt ..."
sed -e "s/OpenGPGCheck = yes/OpenGPGCheck = no/g" -i /etc/abrt/abrt-action-save-package-data.conf sed -e "s/OpenGPGCheck = yes/OpenGPGCheck = no/g" -i /etc/abrt/abrt-action-save-package-data.conf
cp -f /etc/mailx_event.conf /etc/libreport/events.d/mailx_event.conf
/usr/sbin/abrtd /usr/sbin/abrtd
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment