diff options
Diffstat (limited to 'base/server/upgrade')
| -rw-r--r-- | base/server/upgrade/10.0.6/.gitignore | 4 | ||||
| -rwxr-xr-x | base/server/upgrade/10.0.99/02-RemoveAuthProperties (renamed from base/server/upgrade/10.0.99/02-UpdateAuthzProperties) | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/base/server/upgrade/10.0.6/.gitignore b/base/server/upgrade/10.0.6/.gitignore new file mode 100644 index 000000000..5e7d2734c --- /dev/null +++ b/base/server/upgrade/10.0.6/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore diff --git a/base/server/upgrade/10.0.99/02-UpdateAuthzProperties b/base/server/upgrade/10.0.99/02-RemoveAuthProperties index 992b2d518..83719fc75 100755 --- a/base/server/upgrade/10.0.99/02-UpdateAuthzProperties +++ b/base/server/upgrade/10.0.99/02-RemoveAuthProperties @@ -21,25 +21,22 @@ import os import pki -import shutil import pki.server.upgrade -class UpdateAuthzProperties(pki.server.upgrade.PKIServerUpgradeScriptlet): +class RemoveAuthProperties(pki.server.upgrade.PKIServerUpgradeScriptlet): def __init__(self): - self.message = 'Update auth.properties' + self.message = 'Remove auth.properties' def upgrade_subsystem(self, instance, subsystem): + auth_properties = os.path.join( instance.base_dir, 'webapps', subsystem.name, 'WEB-INF', 'auth.properties') self.backup(auth_properties) - default_auth_properties = os.path.join( - pki.SHARE_DIR, subsystem.name, - 'webapps', subsystem.name, - 'WEB-INF', 'auth.properties') - shutil.copyfile(default_auth_properties, auth_properties) + if os.path.exists(auth_properties): + os.remove(auth_properties) |