starlingx/nfv
Code Issues Proposed changes

Merge "Duplicate pmon.d conf files to another location"

Browse Source
This commit is contained in:
Zuul 2022-08-29 21:52:10 +00:00 committed by Gerrit Code Review
commit 2e008011ae
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mtce-guest/debian/deb_folder/mtce-guest-server.install
View File

@ -1,6 +1,7 @@
usr/local/bin/guestServer
etc/init.d/guestServer etc/init.d/guestServer
etc/logrotate.d/guestServer.logrotate etc/logrotate.d/guestServer.logrotate
etc/mtc/guestServer.ini etc/mtc/guestServer.ini
etc/pmon.d/guestServer.conf
etc/mtc/tmp etc/mtc/tmp
etc/pmon.d/guestServer.conf
usr/local/bin/guestServer
usr/share/starlingx/pmon.d/guestServer.conf

10
mtce-guest/debian/deb_folder/rules
View File

@ -7,7 +7,8 @@ export BINDIR=/usr/local/bin
export INITDIR=$(ROOT)/etc/init.d export INITDIR=$(ROOT)/etc/init.d
export LOGDIR=$(ROOT)/etc/logrotate.d export LOGDIR=$(ROOT)/etc/logrotate.d
export MTCDIR=$(ROOT)/etc/mtc export MTCDIR=$(ROOT)/etc/mtc
export PMONDIR=$(ROOT)/etc/pmon.d export PMONDIR_1=${ROOT}/usr/share/starlingx/pmon.d
export PMONDIR_2=$(ROOT)/etc/pmon.d
export SYSCONFDIR=/etc export SYSCONFDIR=/etc
export UNITDIR=/lib/systemd/system export UNITDIR=/lib/systemd/system
@ -20,6 +21,7 @@ override_dh_auto_install:
SYSCONFIGDIR=$(ROOT)/$(SYSCONFDIR) \ SYSCONFIGDIR=$(ROOT)/$(SYSCONFDIR) \
LOCALBINDIR=$(ROOT)/$(BINDIR) \ LOCALBINDIR=$(ROOT)/$(BINDIR) \
UNITDIR=$(ROOT)/$(UNITDIR) install UNITDIR=$(ROOT)/$(UNITDIR) install
install -d -m 755 $(INITDIR) install -d -m 755 $(INITDIR)
install -p -D -m 700 scripts/guestAgent $(INITDIR)/guestAgent install -p -D -m 700 scripts/guestAgent $(INITDIR)/guestAgent
install -p -D -m 700 scripts/guestServer $(INITDIR)/guestServer install -p -D -m 700 scripts/guestServer $(INITDIR)/guestServer
@ -30,8 +32,10 @@ override_dh_auto_install:
install -d -m 755 $(MTCDIR)/tmp install -d -m 755 $(MTCDIR)/tmp
install -p -D -m 644 scripts/guest.ini $(MTCDIR)/guestAgent.ini install -p -D -m 644 scripts/guest.ini $(MTCDIR)/guestAgent.ini
install -p -D -m 644 scripts/guest.ini $(MTCDIR)/guestServer.ini install -p -D -m 644 scripts/guest.ini $(MTCDIR)/guestServer.ini
install -d -m 755 $(PMONDIR) install -d -m 755 $(PMONDIR_1)
install -p -D -m 644 scripts/guestServer.pmon $(PMONDIR)/guestServer.conf install -p -D -m 644 scripts/guestServer.pmon $(PMONDIR_1)/guestServer.conf
install -d -m 755 $(PMONDIR_2)
install -p -D -m 644 scripts/guestServer.pmon $(PMONDIR_2)/guestServer.conf
override_dh_installsystemd: override_dh_installsystemd:
dh_installsystemd --name guestServer dh_installsystemd --name guestServer