diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2013-04-10 15:10:22 -0400 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-04-17 11:30:45 -0400 |
| commit | aea976ad646037d3122113790175d7e2edb4b33a (patch) | |
| tree | 0328e4d3698afa02988450244df894e94bbec3fd /base/server/upgrade | |
| parent | 649c78fe91dcaca7308652848104a81633d8268d (diff) | |
| download | pki-aea976ad646037d3122113790175d7e2edb4b33a.tar.gz pki-aea976ad646037d3122113790175d7e2edb4b33a.tar.xz pki-aea976ad646037d3122113790175d7e2edb4b33a.zip | |
Refactored pki.upgrade module.
Some common constants and methods in pki.upgrade have been moved
into the pki module.
Ticket #544
Diffstat (limited to 'base/server/upgrade')
| -rw-r--r-- | base/server/upgrade/10.0.0/.gitignore | 4 | ||||
| -rwxr-xr-x | base/server/upgrade/10.0.1/01-ReplaceRandomNumberGenerator | 7 | ||||
| -rwxr-xr-x | base/server/upgrade/10.0.1/02-CloningInterfaceChanges | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/base/server/upgrade/10.0.0/.gitignore b/base/server/upgrade/10.0.0/.gitignore new file mode 100644 index 000000000..5e7d2734c --- /dev/null +++ b/base/server/upgrade/10.0.0/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore diff --git a/base/server/upgrade/10.0.1/01-ReplaceRandomNumberGenerator b/base/server/upgrade/10.0.1/01-ReplaceRandomNumberGenerator index 029f295e9..6d3931e85 100755 --- a/base/server/upgrade/10.0.1/01-ReplaceRandomNumberGenerator +++ b/base/server/upgrade/10.0.1/01-ReplaceRandomNumberGenerator @@ -27,6 +27,7 @@ import signal import sys from lxml import etree +import pki import pki.upgrade @@ -41,7 +42,7 @@ class ReplaceRandomNumberGenerator(pki.upgrade.PKIUpgradeScriptlet): def upgrade_subsystem(self, instance, subsystem): context_xml = os.path.join( - pki.upgrade.INSTANCE_BASE_DIR, + pki.INSTANCE_BASE_DIR, instance, 'webapps', subsystem, 'META-INF', 'context.xml') @@ -63,7 +64,7 @@ class ReplaceRandomNumberGenerator(pki.upgrade.PKIUpgradeScriptlet): def update_root_context_xml(self, instance): context_xml = os.path.join( - pki.upgrade.INSTANCE_BASE_DIR, + pki.INSTANCE_BASE_DIR, instance, 'webapps', 'ROOT', 'META-INF', 'context.xml') @@ -83,7 +84,7 @@ class ReplaceRandomNumberGenerator(pki.upgrade.PKIUpgradeScriptlet): source = '/usr/share/pki/server/webapps/pki/META-INF/context.xml' meta_inf_dir = os.path.join( - pki.upgrade.INSTANCE_BASE_DIR, + pki.INSTANCE_BASE_DIR, instance, 'webapps', 'pki', 'META-INF') context_xml = os.path.join(meta_inf_dir, 'context.xml') diff --git a/base/server/upgrade/10.0.1/02-CloningInterfaceChanges b/base/server/upgrade/10.0.1/02-CloningInterfaceChanges index 6b3f6b6f5..60bbae605 100755 --- a/base/server/upgrade/10.0.1/02-CloningInterfaceChanges +++ b/base/server/upgrade/10.0.1/02-CloningInterfaceChanges @@ -22,6 +22,8 @@ import os import sys from lxml import etree as ET + +import pki import pki.upgrade class CloningInterfaceChanges(pki.upgrade.PKIUpgradeScriptlet): @@ -100,7 +102,7 @@ class CloningInterfaceChanges(pki.upgrade.PKIUpgradeScriptlet): def upgrade_subsystem(self, instance, subsystem): web_xml = os.path.join( - pki.upgrade.INSTANCE_BASE_DIR, + pki.INSTANCE_BASE_DIR, instance, 'webapps', subsystem, 'WEB-INF', 'web.xml') |