Patches to get nuxwdog working with systemd

This patch adds some new unit files and targets for starting instances
with nuxwdog, as well as logic within the pki-server nuxwdog module to
switch to/from the old and new systemd unit files.

It also corrects some issues found in additional testing of the nuxwdog
change scripts.

To use nuxwdog to start the instance, a user needs to do the following:

1. Create an instance normally.
2. Run: pki-server instance-nuxwdog-enable <instance_name>
3. Start the instance using:
   systemctl start pki-tomcatd-nuxwdog@<instance_name>.service

To revert the instance, simply do the following:

1. Run: pki-server instance-nuxwdog-disable <instance_name>
2. Start the instance using:
   systemctl start pki-tomcatd@<instance_name>.service

1 files changed, 2 insertions, 2 deletions

diff --git a/base/server/python/pki/server/cli/instance.py b/base/server/python/pki/server/cli/instance.py
index 37db03988..becad1447 100644
--- a/base/server/python/pki/server/cli/instance.py
+++ b/base/server/python/pki/server/cli/instance.py
@@ -378,7 +378,7 @@ class InstanceNuxwdogEnableCLI(pki.cli.CLI):
 
         module.enable_nuxwdog(instance)  # pylint: disable=no-member,maybe-no-member
 
-        self.print_message('nuxwdog enabled for instance %s' % instance_name)
+        self.print_message('Nuxwdog enabled for instance %s.' % instance_name)
 
 
 class InstanceNuxwdogDisableCLI(pki.cli.CLI):
@@ -432,4 +432,4 @@ class InstanceNuxwdogDisableCLI(pki.cli.CLI):
 
         module.disable_nuxwdog(instance)  # pylint: disable=no-member,maybe-no-member
 
-        self.print_message('nuxwdog disabled for instance %s' % instance_name)
+        self.print_message('Nuxwdog disabled for instance %s.' % instance_name)