Update PKIServer.remove()

The PKIServer.remove() has been updated to remove the /var/lib/pki/<instance>/alias symlink if it exists.
dogtagpki · Sep 19, 2024 · d07d0c7 · d07d0c7
1 parent 69c899c
commit d07d0c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/acme-separate-test.yml b/.github/workflows/acme-separate-test.yml
@@ -744,7 +744,6 @@ jobs:
 
           # TODO: review permissions
           cat > expected << EOF
-          lrwxrwxrwx pkiuser pkiuser alias -> /var/lib/pki/pki-tomcat/conf/alias
           lrwxrwxrwx pkiuser pkiuser conf -> /etc/pki/pki-tomcat
           lrwxrwxrwx pkiuser pkiuser logs -> /var/log/pki/pki-tomcat
           EOF

diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py
@@ -1300,6 +1300,11 @@ def remove(self, remove_conf=False, remove_logs=False, force=False):
         logger.info('Removing %s', self.bin_dir)
         pki.util.unlink(self.bin_dir, force=force)
 
+        # remove /var/lib/pki/<instance>/alias if exists
+        if os.path.islink(self.nssdb_link):
+            logger.info('Removing %s', self.nssdb_link)
+            pki.util.unlink(self.nssdb_link)
+
         if os.path.isdir(self.base_dir) and not os.listdir(self.base_dir):
 
             # Remove instance base dir if empty