diff --git a/mtce-control/debian/deb_folder/mtce-control.install b/mtce-control/debian/deb_folder/mtce-control.install index b7cce677..3f191b67 100644 --- a/mtce-control/debian/deb_folder/mtce-control.install +++ b/mtce-control/debian/deb_folder/mtce-control.install @@ -1,5 +1,6 @@ +debian/systemd/00-mtce-control.preset etc/systemd/system-preset +lib/systemd/system/hbsAgent.service etc/init.d/goenabledControl etc/init.d/hbsAgent etc/pmon.d/hbsAgent.conf -lib/systemd/system/hbsAgent.service -debian/systemd/00-mtce-control.preset etc/systemd/system-preset +usr/share/starlingx/pmon.d/hbsAgent.conf diff --git a/mtce-control/debian/deb_folder/rules b/mtce-control/debian/deb_folder/rules index f19c83d7..54a1530f 100644 --- a/mtce-control/debian/deb_folder/rules +++ b/mtce-control/debian/deb_folder/rules @@ -2,6 +2,7 @@ # export DH_VERBOSE = 1 export ROOT = debian/tmp +export PMONDIR = usr/share/starlingx/pmon.d %: dh $@ @@ -12,6 +13,9 @@ override_dh_auto_install: _unitdir=/lib/systemd/system \ _datarootdir=/usr/share \ install + + install -m 644 -p -D scripts/hbsAgent.conf $(ROOT)/$(PMONDIR)/hbsAgent.conf + dh_install override_dh_installsystemd: diff --git a/mtce/debian/deb_folder/mtce-lmon.install b/mtce/debian/deb_folder/mtce-lmon.install index c0363bb3..585617a8 100644 --- a/mtce/debian/deb_folder/mtce-lmon.install +++ b/mtce/debian/deb_folder/mtce-lmon.install @@ -3,3 +3,4 @@ etc/logrotate.d/lmon.logrotate etc/mtc/lmond.conf etc/pmon.d/lmon.conf usr/local/bin/lmond +usr/share/starlingx/pmon.d/lmon.conf diff --git a/mtce/debian/deb_folder/mtce.install b/mtce/debian/deb_folder/mtce.install index b94b2cec..4566f243 100644 --- a/mtce/debian/deb_folder/mtce.install +++ b/mtce/debian/deb_folder/mtce.install @@ -44,3 +44,12 @@ usr/sbin/dmemchk.sh usr/sbin/fsync usr/share/mtce/hwclock.service usr/share/mtce/hwclock.sh +usr/share/starlingx/pmon.d/acpid.conf +usr/share/starlingx/pmon.d/fsmon.conf +usr/share/starlingx/pmon.d/hbsClient.conf +usr/share/starlingx/pmon.d/mtcClient.conf +usr/share/starlingx/pmon.d/mtcalarm.conf +usr/share/starlingx/pmon.d/mtclogd.conf +usr/share/starlingx/pmon.d/sssd.conf +usr/share/starlingx/pmon.d/sshd.conf +usr/share/starlingx/pmon.d/syslog-ng.conf diff --git a/mtce/debian/deb_folder/rules b/mtce/debian/deb_folder/rules index a9c1dfc5..c2f116f4 100644 --- a/mtce/debian/deb_folder/rules +++ b/mtce/debian/deb_folder/rules @@ -8,14 +8,15 @@ export MTCESHAREDIR = $(ROOT)/usr/share/mtce export OCFPLATFORMDIR = $(ROOT)/usr/lib/ocf/resource.d/platform export SBINDIR = $(ROOT)/usr/sbin export LOCAL_SBINDIR = $(ROOT)/usr/local/sbin -export UNITDIR=$(ROOT)/lib/systemd/system +export UNITDIR = $(ROOT)/lib/systemd/system +export PMONDIR_1 = $(ROOT)/usr/share/starlingx/pmon.d export SYSCONFDIR = $(ROOT)/etc export BMCCONFDIR = $(SYSCONFDIR)/bmc/server_profiles.d export COLLECTDIR = $(SYSCONFDIR)/collect.d export INITDIR =$(SYSCONFDIR)/init.d export LOGDIR = $(SYSCONFDIR)/logrotate.d -export PMONDIR = $(SYSCONFDIR)/pmon.d +export PMONDIR_2 = $(SYSCONFDIR)/pmon.d export SERVICESDIR = $(SYSCONFDIR)/services.d export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') @@ -106,17 +107,30 @@ override_dh_auto_install: install -m 755 -p -D scripts/dmemchk.sh $(SBINDIR) # Process monitor config files - install -m 755 -d $(PMONDIR) - install -m 644 -p -D scripts/mtcClient.conf $(PMONDIR)/mtcClient.conf - install -m 644 -p -D scripts/hbsClient.conf $(PMONDIR)/hbsClient.conf - install -m 644 -p -D pmon/scripts/acpid.conf $(PMONDIR)/acpid.conf - install -m 644 -p -D pmon/scripts/sshd.conf $(PMONDIR)/sshd.conf - install -m 644 -p -D pmon/scripts/syslog-ng.conf $(PMONDIR)/syslog-ng.conf - install -m 644 -p -D pmon/scripts/sssd.conf $(PMONDIR)/sssd.conf - install -m 644 -p -D fsmon/scripts/fsmon.conf $(PMONDIR)/fsmon.conf - install -m 644 -p -D scripts/mtclogd.conf $(PMONDIR)/mtclogd.conf - install -m 644 -p -D alarm/scripts/mtcalarm.pmon.conf $(PMONDIR)/mtcalarm.conf - install -m 644 -p -D lmon/scripts/lmon.pmon.conf $(PMONDIR)/lmon.conf + install -m 755 -d $(PMONDIR_1) + install -m 644 -p -D scripts/mtcClient.conf $(PMONDIR_1)/mtcClient.conf + install -m 644 -p -D scripts/hbsClient.conf $(PMONDIR_1)/hbsClient.conf + install -m 644 -p -D pmon/scripts/acpid.conf $(PMONDIR_1)/acpid.conf + install -m 644 -p -D pmon/scripts/sshd.conf $(PMONDIR_1)/sshd.conf + install -m 644 -p -D pmon/scripts/syslog-ng.conf $(PMONDIR_1)/syslog-ng.conf + install -m 644 -p -D pmon/scripts/sssd.conf $(PMONDIR_1)/sssd.conf + install -m 644 -p -D fsmon/scripts/fsmon.conf $(PMONDIR_1)/fsmon.conf + install -m 644 -p -D scripts/mtclogd.conf $(PMONDIR_1)/mtclogd.conf + install -m 644 -p -D alarm/scripts/mtcalarm.pmon.conf $(PMONDIR_1)/mtcalarm.conf + install -m 644 -p -D lmon/scripts/lmon.pmon.conf $(PMONDIR_1)/lmon.conf + + # Process monitor config files - temporary duplicate of pmon.d files + install -m 755 -d $(PMONDIR_2) + install -m 644 -p -D scripts/mtcClient.conf $(PMONDIR_2)/mtcClient.conf + install -m 644 -p -D scripts/hbsClient.conf $(PMONDIR_2)/hbsClient.conf + install -m 644 -p -D pmon/scripts/acpid.conf $(PMONDIR_2)/acpid.conf + install -m 644 -p -D pmon/scripts/sshd.conf $(PMONDIR_2)/sshd.conf + install -m 644 -p -D pmon/scripts/syslog-ng.conf $(PMONDIR_2)/syslog-ng.conf + install -m 644 -p -D pmon/scripts/sssd.conf $(PMONDIR_2)/sssd.conf + install -m 644 -p -D fsmon/scripts/fsmon.conf $(PMONDIR_2)/fsmon.conf + install -m 644 -p -D scripts/mtclogd.conf $(PMONDIR_2)/mtclogd.conf + install -m 644 -p -D alarm/scripts/mtcalarm.pmon.conf $(PMONDIR_2)/mtcalarm.conf + install -m 644 -p -D lmon/scripts/lmon.pmon.conf $(PMONDIR_2)/lmon.conf # Log rotation install -m 755 -d $(LOGDIR)