99-orchestra.conf conflict in client and logging packages

[Joshua Tobin]

There is a conflict in /etc/rsyslog.d/99-orchestra.conf when installing ubuntu-orchestra-logging-server on a host that already has ubuntu-orchestra-client installed. It seems there is a 99-orchestra.conf for both packages. Normally most folks won't run into this as the client package isn't a dependency of the ubuntu-orchestra-server pacakge, however it would be helpful to be able to have both packages installed when spinning up multiple hosts for testing in the lab.

There are two ways in which I can think to fix this. I've got a patch for each worked up.

1. Add a dpkg-divert to the logging package if the file already exists
2. Just rename 99-orchestra.conf to 95-orchestra.conf in the logging package.

$ sudo dpkg -i /var/cache/apt/archives/ubuntu-orchestra-client_2.28-0ubuntu1_all.deb
(Reading database ... 155855 files and directories currently installed.)
Unpacking ubuntu-orchestra-client (from .../ubuntu-orchestra-client_2.28-0ubuntu1_all.deb) ...
dpkg: error processing /var/cache/apt/archives/ubuntu-orchestra-client_2.28-0ubuntu1_all.deb (--install):
 trying to overwrite '/etc/rsyslog.d/99-orchestra.conf', which is also in package ubuntu-orchestra-logging-server 2.28-0ubuntu1
Errors were encountered while processing:
 /var/cache/apt/archives/ubuntu-orchestra-client_2.28-0ubuntu1_all.deb