starlingx/nfv
Code Issues Proposed changes

Merge "Debian: Remove conf files from etc-pmon.d"

Browse Source
This commit is contained in:
Zuul 2022-09-30 19:10:38 +00:00 committed by Gerrit Code Review
commit d23335d98e
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -7,8 +7,7 @@ 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_1=${ROOT}/usr/share/starlingx/pmon.d export PMONDIR=${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
@ -32,10 +31,8 @@ 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_1) install -d -m 755 $(PMONDIR)
install -p -D -m 644 scripts/guestServer.pmon $(PMONDIR_1)/guestServer.conf install -p -D -m 644 scripts/guestServer.pmon $(PMONDIR)/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 -pmtce-guest-server --name guestServer guestServer.service dh_installsystemd -pmtce-guest-server --name guestServer guestServer.service