Reorganized deployment tools.

The pkispawn and pkidestroy scripts have been moved into sbin folder.
The Python deployment library and the scriptlets were moved into
pki.server.deployment and pki.server.deployment.scriptlets packages,
respectively.

22 files changed, 47 insertions, 93 deletions

diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt
index 89fa033a8..ddacbc1ad 100644
--- a/base/server/CMakeLists.txt
+++ b/base/server/CMakeLists.txt
@@ -79,23 +79,11 @@ install(
 
 # install executables
 install(
-    FILES
-        src/pkispawn
-        src/pkidestroy
-    DESTINATION
-        ${SBIN_INSTALL_DIR}
-    PERMISSIONS
-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
-        GROUP_EXECUTE GROUP_READ
-        WORLD_EXECUTE WORLD_READ
-)
-
-install(
-    FILES
-        sbin/pki-server-upgrade
+    DIRECTORY
+        sbin/
     DESTINATION
         ${SBIN_INSTALL_DIR}
-    PERMISSIONS
+    FILE_PERMISSIONS
         OWNER_EXECUTE OWNER_WRITE OWNER_READ
         GROUP_EXECUTE GROUP_READ
         WORLD_EXECUTE WORLD_READ
@@ -160,40 +148,6 @@ install(
         ${SYSCONF_INSTALL_DIR}/pki
 )
 
-install(
-    FILES
-        src/engine/pkiconfig.py
-        src/engine/pkihelper.py
-        src/engine/pkilogging.py
-        src/engine/pkimanifest.py
-        src/engine/pkimessages.py
-        src/engine/pkiparser.py
-        src/engine/pkiscriptlet.py
-        src/scriptlets/configuration.py
-        src/scriptlets/finalization.py
-        src/scriptlets/infrastructure_layout.py
-        src/scriptlets/initialization.py
-        src/scriptlets/instance_layout.py
-        src/scriptlets/security_databases.py
-        src/scriptlets/selinux_setup.py
-        src/scriptlets/slot_substitution.py
-        src/scriptlets/subsystem_layout.py
-        src/scriptlets/webapp_deployment.py
-    DESTINATION
-        ${PYTHON_SITE_PACKAGES}/pki/deployment
-    PERMISSIONS
-        OWNER_WRITE OWNER_READ
-        GROUP_READ
-        WORLD_READ
-)
-install(
-    CODE
-        "execute_process(
-            COMMAND
-                ${CMAKE_COMMAND} -E touch
-                \"\$ENV{DESTDIR}${PYTHON_SITE_PACKAGES}/pki/deployment/__init__.py\")"
-)
-
 # install empty directories
 install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/lock/pki)")
 install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/run/pki)")
diff --git a/base/server/python/pki/server/deployment/__init__.py b/base/server/python/pki/server/deployment/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/base/server/python/pki/server/deployment/__init__.py
diff --git a/base/server/src/engine/pkiconfig.py b/base/server/python/pki/server/deployment/pkiconfig.py
index 2e9463b9d..2e9463b9d 100644
--- a/base/server/src/engine/pkiconfig.py
+++ b/base/server/python/pki/server/deployment/pkiconfig.py
diff --git a/base/server/src/engine/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py
index 6d47a902b..6d47a902b 100644
--- a/base/server/src/engine/pkihelper.py
+++ b/base/server/python/pki/server/deployment/pkihelper.py
diff --git a/base/server/src/engine/pkilogging.py b/base/server/python/pki/server/deployment/pkilogging.py
index c91a7656f..c91a7656f 100644
--- a/base/server/src/engine/pkilogging.py
+++ b/base/server/python/pki/server/deployment/pkilogging.py
diff --git a/base/server/src/engine/pkimanifest.py b/base/server/python/pki/server/deployment/pkimanifest.py
index dea2af275..dea2af275 100644
--- a/base/server/src/engine/pkimanifest.py
+++ b/base/server/python/pki/server/deployment/pkimanifest.py
diff --git a/base/server/src/engine/pkimessages.py b/base/server/python/pki/server/deployment/pkimessages.py
index 2e1ecba45..2e1ecba45 100644
--- a/base/server/src/engine/pkimessages.py
+++ b/base/server/python/pki/server/deployment/pkimessages.py
diff --git a/base/server/src/engine/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 8dbed8deb..8dbed8deb 100644
--- a/base/server/src/engine/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
diff --git a/base/server/src/engine/pkiscriptlet.py b/base/server/python/pki/server/deployment/pkiscriptlet.py
index f37bb1c15..f37bb1c15 100644
--- a/base/server/src/engine/pkiscriptlet.py
+++ b/base/server/python/pki/server/deployment/pkiscriptlet.py
diff --git a/base/server/python/pki/server/deployment/scriptlets/__init__.py b/base/server/python/pki/server/deployment/scriptlets/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/base/server/python/pki/server/deployment/scriptlets/__init__.py
diff --git a/base/server/src/scriptlets/configuration.py b/base/server/python/pki/server/deployment/scriptlets/configuration.py
index d32437f0b..004d8c28d 100644
--- a/base/server/src/scriptlets/configuration.py
+++ b/base/server/python/pki/server/deployment/scriptlets/configuration.py
@@ -22,9 +22,9 @@
 import json
 
 # PKI Deployment Imports
-from . import pkiconfig as config
-from . import pkimessages as log
-from . import pkiscriptlet
+from .. import pkiconfig as config
+from .. import pkimessages as log
+from .. import pkiscriptlet
 import pki.system
 import pki.encoder
 
diff --git a/base/server/src/scriptlets/finalization.py b/base/server/python/pki/server/deployment/scriptlets/finalization.py
index 0d937584a..0573c24ef 100644
--- a/base/server/src/scriptlets/finalization.py
+++ b/base/server/python/pki/server/deployment/scriptlets/finalization.py
@@ -20,10 +20,10 @@
 #
 
 # PKI Deployment Imports
-from . import pkiconfig as config
-from . import pkimanifest as manifest
-from . import pkimessages as log
-from . import pkiscriptlet
+from .. import pkiconfig as config
+from .. import pkimanifest as manifest
+from .. import pkimessages as log
+from .. import pkiscriptlet
 
 
 # PKI Deployment Finalization Scriptlet
diff --git a/base/server/src/scriptlets/infrastructure_layout.py b/base/server/python/pki/server/deployment/scriptlets/infrastructure_layout.py
index e4d32bb0b..5427eebca 100644
--- a/base/server/src/scriptlets/infrastructure_layout.py
+++ b/base/server/python/pki/server/deployment/scriptlets/infrastructure_layout.py
@@ -20,9 +20,9 @@
 #
 
 # PKI Deployment Imports
-from . import pkiconfig as config
-from . import pkimessages as log
-from . import pkiscriptlet
+from .. import pkiconfig as config
+from .. import pkimessages as log
+from .. import pkiscriptlet
 
 
 # PKI Deployment Top-Level Infrastructure Layout Scriptlet
diff --git a/base/server/src/scriptlets/initialization.py b/base/server/python/pki/server/deployment/scriptlets/initialization.py
index 55b984693..54349fc01 100644
--- a/base/server/src/scriptlets/initialization.py
+++ b/base/server/python/pki/server/deployment/scriptlets/initialization.py
@@ -20,9 +20,9 @@
 #
 
 # PKI Deployment Imports
-from . import pkiconfig as config
-from . import pkimessages as log
-from . import pkiscriptlet
+from .. import pkiconfig as config
+from .. import pkimessages as log
+from .. import pkiscriptlet
 
 
 # PKI Deployment Initialization Scriptlet
diff --git a/base/server/src/scriptlets/instance_layout.py b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
index fe02a9f9d..081d64029 100644
--- a/base/server/src/scriptlets/instance_layout.py
+++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
@@ -24,9 +24,9 @@ import os
 
 
 # PKI Deployment Imports
-from . import pkiconfig as config
-from . import pkimessages as log
-from . import pkiscriptlet
+from .. import pkiconfig as config
+from .. import pkimessages as log
+from .. import pkiscriptlet
 
 
 # PKI Deployment Instance Layout Scriptlet
diff --git a/base/server/src/scriptlets/security_databases.py b/base/server/python/pki/server/deployment/scriptlets/security_databases.py
index aa522ce04..3d3193cef 100644
--- a/base/server/src/scriptlets/security_databases.py
+++ b/base/server/python/pki/server/deployment/scriptlets/security_databases.py
@@ -20,9 +20,9 @@
 #
 
 # PKI Deployment Imports
-from . import pkiconfig as config
-from . import pkimessages as log
-from . import pkiscriptlet
+from .. import pkiconfig as config
+from .. import pkimessages as log
+from .. import pkiscriptlet
 
 
 # PKI Deployment Security Databases Scriptlet
diff --git a/base/server/src/scriptlets/selinux_setup.py b/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py
index 9f9ad8b8b..177233afc 100644
--- a/base/server/src/scriptlets/selinux_setup.py
+++ b/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py
@@ -25,10 +25,10 @@ if selinux.is_selinux_enabled():
     import seobject
 
 # PKI Deployment Imports
-from . import pkiconfig as config
-from .pkiconfig import pki_selinux_config_ports as ports
-from . import pkimessages as log
-from . import pkiscriptlet
+from .. import pkiconfig as config
+from ..pkiconfig import pki_selinux_config_ports as ports
+from .. import pkimessages as log
+from .. import pkiscriptlet
 
 
 # PKI Deployment Selinux Setup Scriptlet
diff --git a/base/server/src/scriptlets/slot_substitution.py b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py
index 2bb888dfd..726b6dfc0 100644
--- a/base/server/src/scriptlets/slot_substitution.py
+++ b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py
@@ -20,9 +20,9 @@
 #
 
 # PKI Deployment Imports
-from . import pkiconfig as config
-from . import pkimessages as log
-from . import pkiscriptlet
+from .. import pkiconfig as config
+from .. import pkimessages as log
+from .. import pkiscriptlet
 
 
 # PKI Deployment Slot Substitution Scriptlet
diff --git a/base/server/src/scriptlets/subsystem_layout.py b/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py
index 81dedf68c..8aae3f6c6 100644
--- a/base/server/src/scriptlets/subsystem_layout.py
+++ b/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py
@@ -20,9 +20,9 @@
 #
 
 # PKI Deployment Imports
-from . import pkiconfig as config
-from . import pkimessages as log
-from . import pkiscriptlet
+from .. import pkiconfig as config
+from .. import pkimessages as log
+from .. import pkiscriptlet
 
 
 # PKI Deployment Subsystem Layout Scriptlet
diff --git a/base/server/src/scriptlets/webapp_deployment.py b/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py
index 4a37b6df9..ccbf4ea90 100644
--- a/base/server/src/scriptlets/webapp_deployment.py
+++ b/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py
@@ -23,9 +23,9 @@
 import os
 
 # PKI Deployment Imports
-from . import pkiconfig as config
-from . import pkimessages as log
-from . import pkiscriptlet
+from .. import pkiconfig as config
+from .. import pkimessages as log
+from .. import pkiscriptlet
 
 
 # PKI Web Application Deployment Scriptlet
diff --git a/base/server/src/pkidestroy b/base/server/sbin/pkidestroy
index 543807563..e61b3fabe 100755
--- a/base/server/src/pkidestroy
+++ b/base/server/sbin/pkidestroy
@@ -34,11 +34,11 @@ try:
     import subprocess
     import time
     from time import strftime as date
-    from pki.deployment import pkiconfig as config
-    from pki.deployment.pkiparser import PKIConfigParser
-    from pki.deployment import pkilogging
-    from pki.deployment import pkimessages as log
-    import pki.deployment.pkihelper as util
+    from pki.server.deployment import pkiconfig as config
+    from pki.server.deployment.pkiparser import PKIConfigParser
+    from pki.server.deployment import pkilogging
+    from pki.server.deployment import pkimessages as log
+    import pki.server.deployment.pkihelper as util
 except ImportError:
     print >> sys.stderr, """\
 There was a problem importing one of the required Python modules. The
@@ -243,7 +243,7 @@ def main(argv):
     deployer = util.PKIDeployer(parser.pki_master_dict)
     rv = 0
     for pki_scriptlet in pki_subsystem_scriptlets:
-        scriptlet = __import__("pki.deployment." +
+        scriptlet = __import__("pki.server.deployment.scriptlets." +
                                pki_scriptlet,
                                fromlist = [pki_scriptlet])
         instance = scriptlet.PkiScriptlet()
diff --git a/base/server/src/pkispawn b/base/server/sbin/pkispawn
index 847f19f53..d07016efc 100755
--- a/base/server/src/pkispawn
+++ b/base/server/sbin/pkispawn
@@ -38,11 +38,11 @@ try:
     import time
     import traceback
     from time import strftime as date
-    from pki.deployment import pkiconfig as config
-    from pki.deployment.pkiparser import PKIConfigParser
-    from pki.deployment import pkilogging
-    from pki.deployment import pkimessages as log
-    import pki.deployment.pkihelper as util
+    from pki.server.deployment import pkiconfig as config
+    from pki.server.deployment.pkiparser import PKIConfigParser
+    from pki.server.deployment import pkilogging
+    from pki.server.deployment import pkimessages as log
+    import pki.server.deployment.pkihelper as util
 except ImportError:
     print >> sys.stderr, """\
 There was a problem importing one of the required Python modules. The
@@ -365,7 +365,7 @@ def main(argv):
     deployer = util.PKIDeployer(parser.pki_master_dict, parser.pki_slots_dict)
     rv = 0
     for pki_scriptlet in pki_subsystem_scriptlets:
-        scriptlet = __import__("pki.deployment." +
+        scriptlet = __import__("pki.server.deployment.scriptlets." +
                                pki_scriptlet,
                                fromlist=[pki_scriptlet])
         instance = scriptlet.PkiScriptlet()