[Pkg-freeipa-devel] dogtag-pki: Changes to 'master-next'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Tue Jul 21 15:04:47 UTC 2015
.classpath | 7
CMakeLists.txt | 11
base/ca/CMakeLists.txt | 8
base/ca/shared/conf/CS.cfg.in | 5
base/ca/shared/conf/Catalina/localhost/ca.xml | 37
base/ca/shared/conf/db.ldif | 5
base/ca/shared/conf/serverCert.profile.exampleWithSANpattern | 68
base/ca/shared/profiles/ca/caInternalAuthServerCert.cfg | 23
base/ca/shared/webapps/ca/404.html | 41
base/ca/shared/webapps/ca/500.html | 41
base/ca/shared/webapps/ca/WEB-INF/velocity.properties | 2
base/ca/shared/webapps/ca/admin/ca/securitydomainlogin.template | 32
base/ca/shared/webapps/ca/admin/ca/sendCookie.template | 32
base/ca/shared/webapps/ca/agent/header.template | 28
base/ca/shared/webapps/ca/agent/index.template | 28
base/ca/shared/webapps/ca/agent/ports.template | 28
base/ca/shared/webapps/ca/ee/ca/ProfileSelect.template | 2
base/ca/shared/webapps/ca/ee/ca/index.html | 35
base/ca/shared/webapps/ca/ee/ca/tabs.html | 3
base/ca/shared/webapps/ca/services.template | 32
base/ca/src/org/dogtagpki/server/ca/rest/CAInstallerService.java | 116
base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java | 194
base/ca/tomcat7/CMakeLists.txt | 6
base/ca/tomcat7/conf/Catalina/localhost/ca.xml | 37
base/ca/tomcat8/CMakeLists.txt | 6
base/ca/tomcat8/conf/Catalina/localhost/ca.xml | 39
base/common/python/pki/__init__.py | 2
base/common/python/pki/cli.py | 72
base/common/src/com/netscape/certsrv/account/AccountInfo.java | 42
base/common/src/com/netscape/certsrv/apps/CMS.java | 24
base/common/src/com/netscape/certsrv/apps/ICMSEngine.java | 11
base/common/src/com/netscape/certsrv/base/EBaseException.java | 2
base/common/src/com/netscape/certsrv/common/Constants.java | 5
base/common/src/com/netscape/certsrv/profile/EProfileException.java | 4
base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java | 19
base/common/src/com/netscape/certsrv/profile/ProfileClient.java | 42
base/common/src/com/netscape/certsrv/profile/ProfileResource.java | 20
base/common/src/com/netscape/certsrv/request/IRequestSubsystem.java | 28
base/common/src/com/netscape/certsrv/system/SystemCertData.java | 13
base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorClient.java | 2
base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorResource.java | 4
base/common/src/com/netscape/certsrv/tps/cert/TPSCertClient.java | 4
base/common/src/com/netscape/certsrv/tps/cert/TPSCertResource.java | 1
base/common/src/com/netscape/certsrv/tps/connector/ConnectorClient.java | 2
base/common/src/com/netscape/certsrv/tps/connector/ConnectorResource.java | 4
base/common/src/com/netscape/certsrv/tps/profile/ProfileClient.java | 2
base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingClient.java | 2
base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingResource.java | 4
base/common/src/com/netscape/certsrv/tps/profile/ProfileResource.java | 4
base/common/upgrade/10.2.3/.gitignore | 4
base/java-tools/src/com/netscape/cmstools/profile/ProfileAddCLI.java | 21
base/java-tools/src/com/netscape/cmstools/profile/ProfileCLI.java | 15
base/java-tools/src/com/netscape/cmstools/profile/ProfileEditCLI.java | 113
base/java-tools/src/com/netscape/cmstools/profile/ProfileModifyCLI.java | 30
base/java-tools/src/com/netscape/cmstools/profile/ProfileShowCLI.java | 34
base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertFindCLI.java | 10
base/kra/CMakeLists.txt | 8
base/kra/shared/conf/CS.cfg.in | 3
base/kra/shared/conf/Catalina/localhost/kra.xml | 37
base/kra/shared/webapps/kra/404.html | 40
base/kra/shared/webapps/kra/500.html | 40
base/kra/shared/webapps/kra/WEB-INF/velocity.properties | 2
base/kra/shared/webapps/kra/agent/header.template | 28
base/kra/shared/webapps/kra/agent/index.template | 28
base/kra/shared/webapps/kra/agent/kra/top.html | 24
base/kra/shared/webapps/kra/services.template | 32
base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java | 104
base/kra/tomcat7/CMakeLists.txt | 6
base/kra/tomcat7/conf/Catalina/localhost/kra.xml | 37
base/kra/tomcat8/CMakeLists.txt | 6
base/kra/tomcat8/conf/Catalina/localhost/kra.xml | 39
base/ocsp/CMakeLists.txt | 8
base/ocsp/shared/conf/CS.cfg.in | 3
base/ocsp/shared/conf/Catalina/localhost/ocsp.xml | 37
base/ocsp/shared/webapps/ocsp/404.html | 42
base/ocsp/shared/webapps/ocsp/500.html | 45
base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties | 2
base/ocsp/shared/webapps/ocsp/agent/header.template | 28
base/ocsp/shared/webapps/ocsp/agent/index.template | 28
base/ocsp/shared/webapps/ocsp/agent/ports.template | 28
base/ocsp/shared/webapps/ocsp/services.template | 32
base/ocsp/tomcat7/CMakeLists.txt | 6
base/ocsp/tomcat7/conf/Catalina/localhost/ocsp.xml | 37
base/ocsp/tomcat8/CMakeLists.txt | 6
base/ocsp/tomcat8/conf/Catalina/localhost/ocsp.xml | 39
base/server/CMakeLists.txt | 8
base/server/cms/src/com/netscape/cms/profile/common/EnrollProfile.java | 9
base/server/cms/src/com/netscape/cms/profile/common/EnrollProfileContext.java | 31
base/server/cms/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java | 2
base/server/cms/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java | 11
base/server/cms/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java | 30
base/server/cms/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java | 2
base/server/cms/src/com/netscape/cms/servlet/common/CMSTemplate.java | 25
base/server/cms/src/com/netscape/cms/servlet/csadmin/CertUtil.java | 96
base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java | 13
base/server/cms/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java | 8
base/server/cms/src/com/netscape/cms/servlet/tks/TokenServlet.java | 4
base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java | 10
base/server/cmsbundle/src/LogMessages.properties | 8
base/server/cmsbundle/src/UserMessages.properties | 1
base/server/cmscore/src/CMakeLists.txt | 9
base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java | 255
base/server/cmscore/src/com/netscape/cmscore/base/FileConfigStore.java | 4
base/server/cmscore/src/com/netscape/cmscore/base/LDAPConfigStore.java | 169
base/server/cmscore/src/com/netscape/cmscore/dbs/CSCfgDatabase.java | 3
base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java | 13
base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java | 6
base/server/cmscore/src/com/netscape/cmscore/profile/AbstractProfileSubsystem.java | 151
base/server/cmscore/src/com/netscape/cmscore/profile/LDAPProfileSubsystem.java | 350
base/server/cmscore/src/com/netscape/cmscore/profile/ProfileSubsystem.java | 185
base/server/cmscore/src/com/netscape/cmscore/request/RequestSubsystem.java | 6
base/server/config/pkislots.cfg | 2
base/server/etc/default.cfg | 11
base/server/man/man5/pki_default.cfg.5 | 19
base/server/man/man8/pkispawn.8 | 7
base/server/python/pki/server/__init__.py | 28
base/server/python/pki/server/cli/instance.py | 70
base/server/python/pki/server/cli/migrate.py | 431
base/server/python/pki/server/deployment/pkihelper.py | 218
base/server/python/pki/server/deployment/pkimessages.py | 32
base/server/python/pki/server/deployment/pkiparser.py | 26
base/server/python/pki/server/deployment/scriptlets/finalization.py | 11
base/server/python/pki/server/deployment/scriptlets/infrastructure_layout.py | 10
base/server/python/pki/server/deployment/scriptlets/instance_layout.py | 67
base/server/python/pki/server/deployment/scriptlets/security_databases.py | 29
base/server/python/pki/server/deployment/scriptlets/slot_substitution.py | 11
base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py | 95
base/server/sbin/pki-server | 12
base/server/sbin/pki-server-nuxwdog | 43
base/server/sbin/pkispawn | 44
base/server/scripts/operations | 87
base/server/share/conf/Catalina/localhost/ROOT.xml | 30
base/server/share/conf/Catalina/localhost/pki.xml | 30
base/server/share/conf/schema.ldif | 15
base/server/share/conf/server.xml | 310
base/server/share/conf/tomcat.conf | 5
base/server/share/lib/systemd/system/pki-tomcatd.target | 5
base/server/share/lib/systemd/system/pki-tomcatd at .service | 4
base/server/share/webapps/ROOT/index.jsp | 31
base/server/share/webapps/pki/admin/console/config/config_addhsm.vm | 2
base/server/share/webapps/pki/admin/console/config/login.vm | 2
base/server/share/webapps/pki/admin/console/config/securitydomainloginpanel.vm | 2
base/server/share/webapps/pki/admin/console/config/wizard.vm | 2
base/server/share/webapps/pki/css/patternfly.css | 9492 ----------
base/server/share/webapps/pki/css/pki-forms.css | 240
base/server/share/webapps/pki/css/pki-tables.css | 70
base/server/share/webapps/pki/css/pki-ui.css | 159
base/server/share/webapps/pki/js/pki-ui.js | 38
base/server/test/com/netscape/cmscore/app/CMSEngineDefaultStub.java | 3
base/server/tomcat/CMakeLists.txt | 2
base/server/tomcat/src/CMakeLists.txt | 53
base/server/tomcat/src/com/netscape/cms/tomcat/NuxwdogPasswordStore.java | 108
base/server/tomcat/src/com/netscape/cms/tomcat/NuxwdogPasswordStoreInitializer.java | 33
base/server/tomcat/src/com/netscape/cms/tomcat/ProxyRealm.java | 139
base/server/tomcat/src/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java | 172
base/server/tomcat/src/pki-tomcat.mf | 3
base/server/tomcat7/CMakeLists.txt | 10
base/server/tomcat7/conf/Catalina/localhost/ROOT.xml | 30
base/server/tomcat7/conf/Catalina/localhost/pki#admin.xml | 30
base/server/tomcat7/conf/Catalina/localhost/pki#js.xml | 30
base/server/tomcat7/conf/Catalina/localhost/pki.xml | 30
base/server/tomcat7/conf/server.xml | 312
base/server/tomcat7/src/CMakeLists.txt | 159
base/server/tomcat7/src/com/netscape/cms/tomcat/ProxyRealm.java | 139
base/server/tomcat7/src/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java | 172
base/server/tomcat7/src/pki-tomcat.mf | 3
base/server/tomcat8/CMakeLists.txt | 10
base/server/tomcat8/conf/Catalina/localhost/ROOT.xml | 32
base/server/tomcat8/conf/Catalina/localhost/pki#admin.xml | 32
base/server/tomcat8/conf/Catalina/localhost/pki#js.xml | 32
base/server/tomcat8/conf/Catalina/localhost/pki.xml | 32
base/server/tomcat8/conf/server.xml | 297
base/server/tomcat8/src/CMakeLists.txt | 159
base/server/tomcat8/src/com/netscape/cms/tomcat/ProxyRealm.java | 145
base/server/tomcat8/src/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java | 168
base/server/tomcat8/src/pki-tomcat.mf | 3
base/server/upgrade/10.2.3/01-FixInstanceWorkFolderOwnership | 57
base/server/upgrade/10.2.3/02-FixBindPWPrompt | 49
base/symkey/src/com/netscape/symkey/NistSP800_108KDF.cpp | 9
base/symkey/src/com/netscape/symkey/SymKey.cpp | 3
base/tks/CMakeLists.txt | 8
base/tks/shared/conf/CS.cfg.in | 3
base/tks/shared/conf/Catalina/localhost/tks.xml | 37
base/tks/shared/webapps/tks/404.html | 40
base/tks/shared/webapps/tks/500.html | 40
base/tks/shared/webapps/tks/WEB-INF/velocity.properties | 2
base/tks/shared/webapps/tks/agent/header.template | 28
base/tks/shared/webapps/tks/agent/index.template | 28
base/tks/shared/webapps/tks/agent/ports.template | 28
base/tks/shared/webapps/tks/services.template | 32
base/tks/tomcat7/CMakeLists.txt | 6
base/tks/tomcat7/conf/Catalina/localhost/tks.xml | 37
base/tks/tomcat8/CMakeLists.txt | 6
base/tks/tomcat8/conf/Catalina/localhost/tks.xml | 39
base/tps-client/apache/docroot/404.html | 2
base/tps-client/apache/docroot/500.html | 2
base/tps-client/apache/docroot/index.vm | 2
base/tps-client/apache/docroot/tokendb/addResults.template | 3
base/tps-client/apache/docroot/tokendb/auditAdmin.template | 3
base/tps-client/apache/docroot/tokendb/delete.template | 3
base/tps-client/apache/docroot/tokendb/deleteResults.template | 3
base/tps-client/apache/docroot/tokendb/doToken.template | 3
base/tps-client/apache/docroot/tokendb/doTokenConfirm.template | 3
base/tps-client/apache/docroot/tokendb/edit.template | 3
base/tps-client/apache/docroot/tokendb/editResults.template | 3
base/tps-client/apache/docroot/tokendb/editUser.template | 3
base/tps-client/apache/docroot/tokendb/error.template | 3
base/tps-client/apache/docroot/tokendb/index.template | 3
base/tps-client/apache/docroot/tokendb/indexAdmin.template | 3
base/tps-client/apache/docroot/tokendb/indexOperator.template | 3
base/tps-client/apache/docroot/tokendb/new.template | 3
base/tps-client/apache/docroot/tokendb/newUser.template | 3
base/tps-client/apache/docroot/tokendb/revoke.template | 3
base/tps-client/apache/docroot/tokendb/search.template | 3
base/tps-client/apache/docroot/tokendb/searchActivity.template | 3
base/tps-client/apache/docroot/tokendb/searchActivityAdmin.template | 3
base/tps-client/apache/docroot/tokendb/searchActivityAdminResults.template | 3
base/tps-client/apache/docroot/tokendb/searchActivityResults.template | 3
base/tps-client/apache/docroot/tokendb/searchAdmin.template | 3
base/tps-client/apache/docroot/tokendb/searchAdminResults.template | 3
base/tps-client/apache/docroot/tokendb/searchCertificate.template | 3
base/tps-client/apache/docroot/tokendb/searchCertificateResults.template | 3
base/tps-client/apache/docroot/tokendb/searchResults.template | 3
base/tps-client/apache/docroot/tokendb/searchUser.template | 3
base/tps-client/apache/docroot/tokendb/searchUserResults.template | 3
base/tps-client/apache/docroot/tokendb/selfTest.template | 3
base/tps-client/apache/docroot/tokendb/selfTestResults.template | 3
base/tps-client/apache/docroot/tokendb/show.template | 3
base/tps-client/apache/docroot/tokendb/showAdmin.template | 3
base/tps-client/apache/docroot/tokendb/showCert.template | 3
base/tps-client/apache/docroot/tokendb/userDelete.template | 3
base/tps-client/apache/docroot/tps/admin/console/config/config_addhsm.vm | 2
base/tps-client/apache/docroot/tps/admin/console/config/config_db.vm | 2
base/tps-client/apache/docroot/tps/admin/console/config/config_hsm.vm | 2
base/tps-client/apache/docroot/tps/admin/console/config/config_join.vm | 2
base/tps-client/apache/docroot/tps/admin/console/config/config_rootca.vm | 2
base/tps-client/apache/docroot/tps/admin/console/config/login.vm | 2
base/tps-client/apache/docroot/tps/admin/console/config/securitydomainloginpanel.vm | 2
base/tps-client/apache/docroot/tps/admin/console/config/wizard.vm | 2
base/tps/CMakeLists.txt | 8
base/tps/shared/conf/CS.cfg.in | 41
base/tps/shared/conf/Catalina/localhost/tps.xml | 37
base/tps/shared/conf/acl.ldif | 8
base/tps/shared/conf/acl.properties | 2
base/tps/shared/webapps/tps/404.html | 2
base/tps/shared/webapps/tps/500.html | 2
base/tps/shared/webapps/tps/index.html | 1
base/tps/shared/webapps/tps/js/account.js | 30
base/tps/shared/webapps/tps/js/audit.js | 43
base/tps/shared/webapps/tps/js/authenticator.js | 17
base/tps/shared/webapps/tps/js/cert.js | 11
base/tps/shared/webapps/tps/js/config.js | 119
base/tps/shared/webapps/tps/js/connector.js | 17
base/tps/shared/webapps/tps/js/profile-mapping.js | 17
base/tps/shared/webapps/tps/js/profile.js | 102
base/tps/shared/webapps/tps/js/token.js | 16
base/tps/shared/webapps/tps/js/tps.js | 218
base/tps/shared/webapps/tps/services.template | 106
base/tps/shared/webapps/tps/ui/audit.html | 11
base/tps/shared/webapps/tps/ui/authenticator.html | 44
base/tps/shared/webapps/tps/ui/certs.html | 2
base/tps/shared/webapps/tps/ui/config.html | 37
base/tps/shared/webapps/tps/ui/connector.html | 44
base/tps/shared/webapps/tps/ui/group.html | 8
base/tps/shared/webapps/tps/ui/home.html | 40
base/tps/shared/webapps/tps/ui/index.html | 55
base/tps/shared/webapps/tps/ui/profile-mapping.html | 44
base/tps/shared/webapps/tps/ui/profile.html | 44
base/tps/shared/webapps/tps/ui/token.html | 11
base/tps/shared/webapps/tps/ui/user.html | 8
base/tps/src/org/dogtagpki/server/tps/cms/KRARemoteRequestHandler.java | 60
base/tps/src/org/dogtagpki/server/tps/config/ConnectorDatabase.java | 7
base/tps/src/org/dogtagpki/server/tps/engine/TPSEngine.java | 3
base/tps/src/org/dogtagpki/server/tps/main/ExternalRegAttrs.java | 32
base/tps/src/org/dogtagpki/server/tps/main/ExternalRegCertToRecover.java | 11
base/tps/src/org/dogtagpki/server/tps/main/PKCS11Obj.java | 2
base/tps/src/org/dogtagpki/server/tps/processor/TPSEnrollProcessor.java | 181
base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java | 54
base/tps/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java | 101
base/tps/src/org/dogtagpki/server/tps/rest/ConnectorService.java | 99
base/tps/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java | 99
base/tps/src/org/dogtagpki/server/tps/rest/ProfileService.java | 101
base/tps/src/org/dogtagpki/server/tps/rest/TPSCertService.java | 17
base/tps/tomcat7/CMakeLists.txt | 6
base/tps/tomcat7/conf/Catalina/localhost/tps.xml | 37
base/tps/tomcat8/CMakeLists.txt | 6
base/tps/tomcat8/conf/Catalina/localhost/tps.xml | 39
base/util/src/CMakeLists.txt | 10
base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java | 1
base/util/src/com/netscape/cmsutil/password/IPasswordStore.java | 2
base/util/src/com/netscape/cmsutil/password/NuxwdogPasswordStore.java | 103
base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java | 4
base/util/src/netscape/security/pkcs/PKCS10Attribute.java | 2
debian/changelog | 7
debian/control | 7
dev/null |binary
dogtag/common-ui/shared/ca/404.properties | 2
dogtag/common-ui/shared/ca/500.properties | 2
dogtag/common-ui/shared/ca/admin/ca/securitydomainlogin.properties | 2
dogtag/common-ui/shared/ca/admin/ca/sendCookie.properties | 2
dogtag/common-ui/shared/ca/agent/header.properties | 2
dogtag/common-ui/shared/ca/agent/index.properties | 2
dogtag/common-ui/shared/ca/agent/ports.properties | 2
dogtag/common-ui/shared/ca/ee/ca/index.properties | 2
dogtag/common-ui/shared/ca/services.properties | 2
dogtag/common-ui/shared/css/patternfly.css | 9492 ++++++++++
dogtag/common-ui/shared/css/pki-360.css | 1
dogtag/common-ui/shared/css/pki-base.css | 1
dogtag/common-ui/shared/css/pki-forms.css | 240
dogtag/common-ui/shared/css/pki-tables.css | 70
dogtag/common-ui/shared/css/pki-theme.css | 28
dogtag/common-ui/shared/css/pki-ui.css | 184
dogtag/common-ui/shared/fonts/PatternFlyIcons-webfont.ttf |binary
dogtag/common-ui/shared/images/checkbutton-background-disabled.png |binary
dogtag/common-ui/shared/images/checkbutton-background-hover.png |binary
dogtag/common-ui/shared/images/checkbutton-background-selected-disabled.png |binary
dogtag/common-ui/shared/images/checkbutton-background-selected.png |binary
dogtag/common-ui/shared/images/checkbutton-background.png |binary
dogtag/common-ui/shared/images/dialog-button-close.png |binary
dogtag/common-ui/shared/images/input-background.png |binary
dogtag/common-ui/shared/images/radiobutton-background-disabled.png |binary
dogtag/common-ui/shared/images/radiobutton-background-hover.png |binary
dogtag/common-ui/shared/images/radiobutton-background-selected-disabled.png |binary
dogtag/common-ui/shared/images/radiobutton-background-selected.png |binary
dogtag/common-ui/shared/images/radiobutton-background.png |binary
dogtag/common-ui/shared/kra/404.properties | 2
dogtag/common-ui/shared/kra/500.properties | 2
dogtag/common-ui/shared/kra/agent/header.properties | 2
dogtag/common-ui/shared/kra/agent/index.properties | 2
dogtag/common-ui/shared/kra/agent/kra/top.properties | 1
dogtag/common-ui/shared/kra/services.properties | 2
dogtag/common-ui/shared/ocsp/404.properties | 2
dogtag/common-ui/shared/ocsp/500.properties | 2
dogtag/common-ui/shared/ocsp/agent/header.properties | 2
dogtag/common-ui/shared/ocsp/agent/index.properties | 2
dogtag/common-ui/shared/ocsp/agent/ports.properties | 2
dogtag/common-ui/shared/ocsp/services.properties | 2
dogtag/common-ui/shared/pki.properties | 2
dogtag/common-ui/shared/tks/404.properties | 2
dogtag/common-ui/shared/tks/500.properties | 2
dogtag/common-ui/shared/tks/agent/header.properties | 2
dogtag/common-ui/shared/tks/agent/index.properties | 2
dogtag/common-ui/shared/tks/agent/ports.properties | 2
dogtag/common-ui/shared/tks/services.properties | 2
scripts/compose_dogtag_pki_theme_packages | 2
scripts/compose_functions | 6
scripts/compose_pki_console_packages | 2
scripts/compose_pki_core_packages | 2
scripts/compose_pki_test_package | 1
specs/dogtag-pki-theme.spec | 14
specs/dogtag-pki.spec | 40
specs/pki-console.spec | 14
specs/pki-core.spec | 124
tests/dogtag/Makefile | 18
tests/dogtag/acceptance/cli-tests/pki-tests-setup/create-role-users.sh | 88
tests/dogtag/acceptance/install-tests/ca-installer.sh | 461
tests/dogtag/acceptance/install-tests/kra-installer.sh | 160
tests/dogtag/acceptance/install-tests/ocsp-installer.sh | 160
tests/dogtag/acceptance/install-tests/tks-installer.sh | 163
tests/dogtag/acceptance/install-tests/tps-installer.sh | 242
tests/dogtag/acceptance/legacy/ca-tests/scep_tests/scep-enroll.sh | 106
tests/dogtag/acceptance/legacy/subca-tests/scep_tests/subca-scep-enroll.sh | 101
tests/dogtag/acceptance/legacy/tps-tests/tps-enrollments.sh | 5703 ++++++
tests/dogtag/acceptance/quickinstall/rhcs-install-lib.sh | 559
tests/dogtag/acceptance/quickinstall/rhcs-install.sh | 161
tests/dogtag/runtest.sh | 369
tests/dogtag/shared/env.sh | 82
tests/dogtag/shared/pki-cert-cli-lib.sh | 67
tests/dogtag/shared/rhcs-shared.sh | 33
tests/dogtag/topologies.sh | 118
370 files changed, 26086 insertions(+), 13111 deletions(-)
New commits:
commit 79b2a01b2f862472a7c18ad5933d377eb64b4816
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu May 7 14:12:17 2015 +0300
update changelog
diff --git a/debian/changelog b/debian/changelog
index e073c70..0b2f8dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-dogtag-pki (10.2.2-1) UNRELEASED; urgency=medium
+dogtag-pki (10.2.3-1) UNRELEASED; urgency=medium
- * New upstream release based on DOGTAG_10_2_1_FEDORA_22_20150108 tag.
+ * New upstream release based on DOGTAG_10_2_3_FEDORA_22_20150423 tag.
* Refresh patches, drop upstreamed ones.
* control: Drop libcrypt-ssleay-perl and libxml-perl from depends.
* pki-tools.install: Add pki-ca-profile manpage.
commit 493daf0ea3932790343662aa4d0c26bff0a62052
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu May 7 14:09:05 2015 +0300
control: Update vcs-git location (-> dogtag-pki.git).
diff --git a/debian/changelog b/debian/changelog
index 3975e0d..e073c70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ dogtag-pki (10.2.2-1) UNRELEASED; urgency=medium
* pki-server.install: Add sbin/pki-server.
* control: strongswan-starter didn't rename it's 'pki' as planned, so
add an unversioned Conflicts to pki-tools. (Closes: #767561)
+ * control: Update vcs-git location (-> dogtag-pki.git).
-- Timo Aaltonen <tjaalton at debian.org> Thu, 02 Apr 2015 15:45:06 +0300
diff --git a/debian/control b/debian/control
index f6104b1..d459801 100644
--- a/debian/control
+++ b/debian/control
@@ -38,8 +38,8 @@ Build-Depends:
zlib1g-dev,
Standards-Version: 3.9.5
Homepage: http://pki.fedoraproject.org
-Vcs-Git: git://anonscm.debian.org/pkg-freeipa/pki.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-freeipa/pki.git
+Vcs-Git: git://anonscm.debian.org/pkg-freeipa/dogtag-pki.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-freeipa/dogtag-pki.git
Package: dogtag-pki
Architecture: all
commit f1d32af6d49dec01dc41c6ffcd69047f628e7daf
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu May 7 08:14:48 2015 +0300
control: strongswan-starter didn't rename it's 'pki' as planned, so add an unversioned Conflicts to pki-tools. (Closes: #767561)
diff --git a/debian/changelog b/debian/changelog
index 3565bcb..3975e0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ dogtag-pki (10.2.2-1) UNRELEASED; urgency=medium
* fix-jackson-paths.diff: Dropped, obsolete. Refresh other patches
to drop unused jackson includes.
* pki-server.install: Add sbin/pki-server.
+ * control: strongswan-starter didn't rename it's 'pki' as planned, so
+ add an unversioned Conflicts to pki-tools. (Closes: #767561)
-- Timo Aaltonen <tjaalton at debian.org> Thu, 02 Apr 2015 15:45:06 +0300
diff --git a/debian/control b/debian/control
index ab822a1..f6104b1 100644
--- a/debian/control
+++ b/debian/control
@@ -113,8 +113,7 @@ Depends:
${misc:Depends},
${python:Depends},
${shlibs:Depends},
-Breaks: strongswan-starter (<< 5.2.1-5~)
-Replaces: strongswan-starter (<< 5.2.1-5~)
+Conflicts: strongswan-starter
Description: Certificate System - PKI Tools
This package contains PKI executables that can be used to help make
Certificate System into a more complete and robust PKI solution.
commit eebdf04859ba7a58780441c1bec63e6ab1d56c85
Author: Ade Lee <alee at redhat.com>
Date: Thu Apr 23 13:47:24 2015 -0400
Remove duplicate prompt on nuxwdog startup
diff --git a/base/ca/shared/conf/CS.cfg.in b/base/ca/shared/conf/CS.cfg.in
index 8353ede..3d2dd5e 100644
--- a/base/ca/shared/conf/CS.cfg.in
+++ b/base/ca/shared/conf/CS.cfg.in
@@ -816,7 +816,7 @@ internaldb.maxConns=15
internaldb.minConns=3
internaldb.ldapauth.authtype=BasicAuth
internaldb.ldapauth.bindDN=cn=Directory Manager
-internaldb.ldapauth.bindPWPrompt=Internal LDAP Database
+internaldb.ldapauth.bindPWPrompt=internaldb
internaldb.ldapauth.clientCertNickname=
internaldb.ldapconn.host=
internaldb.ldapconn.port=
diff --git a/base/kra/shared/conf/CS.cfg.in b/base/kra/shared/conf/CS.cfg.in
index da71955..7ecacf6 100644
--- a/base/kra/shared/conf/CS.cfg.in
+++ b/base/kra/shared/conf/CS.cfg.in
@@ -224,7 +224,7 @@ internaldb.maxConns=15
internaldb.minConns=3
internaldb.ldapauth.authtype=BasicAuth
internaldb.ldapauth.bindDN=cn=Directory Manager
-internaldb.ldapauth.bindPWPrompt=Internal LDAP Database
+internaldb.ldapauth.bindPWPrompt=internaldb
internaldb.ldapauth.clientCertNickname=
internaldb.ldapconn.host=
internaldb.ldapconn.port=
diff --git a/base/ocsp/shared/conf/CS.cfg.in b/base/ocsp/shared/conf/CS.cfg.in
index cfc9ec2..9c878e8 100644
--- a/base/ocsp/shared/conf/CS.cfg.in
+++ b/base/ocsp/shared/conf/CS.cfg.in
@@ -183,7 +183,7 @@ internaldb.maxConns=15
internaldb.minConns=3
internaldb.ldapauth.authtype=BasicAuth
internaldb.ldapauth.bindDN=cn=Directory Manager
-internaldb.ldapauth.bindPWPrompt=Internal LDAP Database
+internaldb.ldapauth.bindPWPrompt=internaldb
internaldb.ldapauth.clientCertNickname=
internaldb.ldapconn.host=
internaldb.ldapconn.port=
diff --git a/base/server/upgrade/10.2.3/02-FixBindPWPrompt b/base/server/upgrade/10.2.3/02-FixBindPWPrompt
new file mode 100755
index 0000000..7b99afd
--- /dev/null
+++ b/base/server/upgrade/10.2.3/02-FixBindPWPrompt
@@ -0,0 +1,49 @@
+#!/usr/bin/python
+# Authors:
+# Ade Lee <alee at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright (C) 2015 Red Hat, Inc.
+# All rights reserved.
+#
+
+import fileinput
+import os
+import re
+import sys
+import pki.server.upgrade
+
+
+class FixBindPWPrompt(pki.server.upgrade.PKIServerUpgradeScriptlet):
+
+ def __init__(self):
+ self.message = 'Fix bindPWPrompt for internalDB'
+
+ def upgrade_subsystem(self, instance, subsystem):
+
+ cs_cfg = os.path.join(
+ instance.base_dir,
+ 'conf',
+ subsystem.name,
+ 'CS.cfg')
+
+ self.backup(cs_cfg)
+
+ for line in fileinput.input(cs_cfg, inplace=1):
+ line = re.sub(r"^internaldb.ldapauth.bindPWPrompt=.*",
+ "internaldb.ldapauth.bindPWPrompt=internaldb",
+ line)
+ sys.stdout.write(line)
+
diff --git a/base/tks/shared/conf/CS.cfg.in b/base/tks/shared/conf/CS.cfg.in
index 8579ef2..f864e29 100644
--- a/base/tks/shared/conf/CS.cfg.in
+++ b/base/tks/shared/conf/CS.cfg.in
@@ -175,7 +175,7 @@ internaldb.maxConns=15
internaldb.minConns=3
internaldb.ldapauth.authtype=BasicAuth
internaldb.ldapauth.bindDN=cn=Directory Manager
-internaldb.ldapauth.bindPWPrompt=Internal LDAP Database
+internaldb.ldapauth.bindPWPrompt=internaldb
internaldb.ldapauth.clientCertNickname=
internaldb.ldapconn.host=
internaldb.ldapconn.port=
diff --git a/base/tps/shared/conf/CS.cfg.in b/base/tps/shared/conf/CS.cfg.in
index e4733f8..4fa477d 100644
--- a/base/tps/shared/conf/CS.cfg.in
+++ b/base/tps/shared/conf/CS.cfg.in
@@ -164,7 +164,7 @@ internaldb._001=## Internal Database
internaldb._002=##
internaldb.ldapauth.authtype=BasicAuth
internaldb.ldapauth.bindDN=cn=Directory Manager
-internaldb.ldapauth.bindPWPrompt=Internal LDAP Database
+internaldb.ldapauth.bindPWPrompt=internaldb
internaldb.ldapauth.clientCertNickname=
internaldb.ldapconn.host=
internaldb.ldapconn.port=
diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec
index 03a59d8..c602fc7 100644
--- a/specs/dogtag-pki.spec
+++ b/specs/dogtag-pki.spec
@@ -16,35 +16,8 @@ ExcludeArch: ppc ppc64 ppcle ppc64le s390 s390x
%define dogtag_pki_theme_version %{version}
%define esc_version 1.1.0
# NOTE: The following package versions are TLS compliant:
-%define jss_version 4.2.6-35
%define pki_core_version %{version}
%define pki_console_version %{version}
-%if 0%{?rhel}
-%define tomcatjss_version 7.1.0-5
-%else
-%if 0%{?fedora} >= 23
-%define tomcatjss_version 7.1.2
-%else
-%define tomcatjss_version 7.1.1
-%endif
-%endif
-
-Requires: apache-commons-codec
-%if 0%{?fedora} >= 21
-Requires: selinux-policy-targeted >= 3.13.1-9
-%else
-# 0%{?rhel} || 0%{?fedora} < 21
-Requires: selinux-policy-targeted >= 3.12.1-153
-%endif
-
-# Make certain that this 'meta' package requires the latest version(s)
-# of ALL top-level Dogtag PKI support packages
-Requires: jss >= %{jss_version}
-Requires: tomcatjss >= %{tomcatjss_version}
-
-# Make certain that this 'meta' package requires the latest version(s)
-# of ALL top-level Dogtag PKI support javadocs
-Requires: jss-javadoc >= %{jss_version}
# Make certain that this 'meta' package requires the latest version(s)
# of ALL Dogtag PKI theme packages
@@ -122,6 +95,8 @@ rm -rf %{buildroot}
%changelog
* Thu Apr 23 2015 Dogtag Team <pki-devel at redhat.com> 10.2.3-1
- Update release number for release build
+- Remove tomcatjss, jss and selinux requirements as these should
+ be handled by pki packages
* Thu Apr 9 2015 Dogtag Team <pki-devel at redhat.com> 10.2.3-0.1
- Reverted version number back to 10.2.3-0.1
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 30bd909..30b1179 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -53,7 +53,7 @@ BuildRequires: apache-commons-lang
BuildRequires: jakarta-commons-httpclient
BuildRequires: nspr-devel
BuildRequires: nss-devel >= 3.14.3
-BuildRequires: nuxwdog-client-java
+BuildRequires: nuxwdog-client-java >= 1.0.2
BuildRequires: openldap-devel
BuildRequires: pkgconfig
BuildRequires: policycoreutils
@@ -101,15 +101,7 @@ BuildRequires: junit
BuildRequires: jpackage-utils >= 0:1.7.5-10
BuildRequires: jss >= 4.2.6-35
BuildRequires: systemd-units
-%if 0%{?rhel}
-BuildRequires: tomcatjss >= 7.1.0-5
-%else
-%if 0%{?fedora} >= 23
-BuildRequires: tomcatjss >= 7.1.2
-%else
-BuildRequires: tomcatjss >= 7.1.1
-%endif
-%endif
+BuildRequires: tomcatjss >= 7.1.2
# additional build requirements needed to build native 'tpsclient'
# REMINDER: Revisit these once 'tpsclient' is rewritten as a Java app
@@ -354,7 +346,7 @@ Obsoletes: pki-silent < %{version}-%{release}
Requires: java-headless >= 1:1.7.0
Requires: net-tools
-Requires: nuxwdog-client-java
+Requires: nuxwdog-client-java >= 1.0.2
Requires: perl(File::Slurp)
Requires: policycoreutils
Requires: openldap-clients
@@ -390,15 +382,7 @@ Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
-%if 0%{?rhel}
-Requires: tomcatjss >= 7.1.0-5
-%else
-%if 0%{?fedora} >= 23
Requires: tomcatjss >= 7.1.2
-%else
-Requires: tomcatjss >= 7.1.1
-%endif
-%endif
%description -n pki-server
The PKI Server Framework is required by the following four PKI subsystems:
commit d2a7cd515459255fab00618ca903b09b400eaeca
Author: Matthew Harmsen <mharmsen at redhat.com>
Date: Thu Apr 23 09:24:19 2015 -0600
Bumped release number for official release of 10.2.3.
diff --git a/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec
index 94be762..be19079 100644
--- a/specs/dogtag-pki-theme.spec
+++ b/specs/dogtag-pki-theme.spec
@@ -1,6 +1,6 @@
Name: dogtag-pki-theme
Version: 10.2.3
-Release: 0.1%{?dist}
+Release: 1%{?dist}
Summary: Certificate System - Dogtag PKI Theme Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -170,6 +170,9 @@ cd build
%changelog
+* Thu Apr 23 2015 Dogtag Team <pki-devel at redhat.com> 10.2.3-1
+- Update release number for release build
+
* Thu Apr 9 2015 Dogtag Team <pki-devel at redhat.com> 10.2.3-0.1
- Reverted version number back to 10.2.3-0.1
diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec
index 09128cc..03a59d8 100644
--- a/specs/dogtag-pki.spec
+++ b/specs/dogtag-pki.spec
@@ -1,7 +1,7 @@
Summary: Dogtag Public Key Infrastructure (PKI) Suite
Name: dogtag-pki
Version: 10.2.3
-Release: 0.1%{?dist}
+Release: 1%{?dist}
# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
License: GPLv2 and LGPLv2
URL: http://pki.fedoraproject.org/
@@ -120,6 +120,9 @@ rm -rf %{buildroot}
%doc README
%changelog
+* Thu Apr 23 2015 Dogtag Team <pki-devel at redhat.com> 10.2.3-1
+- Update release number for release build
+
* Thu Apr 9 2015 Dogtag Team <pki-devel at redhat.com> 10.2.3-0.1
- Reverted version number back to 10.2.3-0.1
- Added support for Tomcat 8.
diff --git a/specs/pki-console.spec b/specs/pki-console.spec
index e40f3d5..92e61a6 100644
--- a/specs/pki-console.spec
+++ b/specs/pki-console.spec
@@ -1,6 +1,6 @@
Name: pki-console
Version: 10.2.3
-Release: 0.1%{?dist}
+Release: 1%{?dist}
Summary: Certificate System - PKI Console
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -95,6 +95,9 @@ cd build
%changelog
+* Thu Apr 23 2015 Dogtag Team <pki-devel at redhat.com> 10.2.3-1
+- Update release number for release build
+
* Thu Apr 9 2015 Dogtag Team <pki-devel at redhat.com> 10.2.3-0.1
- Reverted version number back to 10.2.3-0.1
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 1fe7fef..30bd909 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -33,7 +33,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: pki-core
Version: 10.2.3
-Release: 0.1%{?dist}
+Release: 1%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -953,6 +953,9 @@ systemctl daemon-reload
%endif # %{with server}
%changelog
+* Thu Apr 23 2015 Dogtag Team <pki-devel at redhat.com> 10.2.3-1
+- Update release number for release build
+
* Thu Apr 9 2015 Dogtag Team <pki-devel at redhat.com> 10.2.3-0.1
- Reverted version number back to 10.2.3-0.1
- Added support for Tomcat 8.
commit 36416c60053dfca56d613bbb3b27187a6bded66b
Author: Matthew Harmsen <mharmsen at redhat.com>
Date: Wed Apr 22 18:45:04 2015 -0600
RHCS 9.0 theme fixes
- PKI TRAC Ticket #1296 - RHCS 9.0 theme
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12a7493..3ed6f00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,9 +69,10 @@ if (NOT APPLICATION_FLAVOR_DOGTAG_PKI_THEME AND
endif ()
# ONLY required for Java-based PKI components
-if (APPLICATION_FLAVOR_PKI_CORE OR
- APPLICATION_FLAVOR_PKI_CONSOLE OR
- APPLICATION_FLAVOR_DOGTAG_PKI_THEME)
+if (APPLICATION_FLAVOR_PKI_CORE OR
+ APPLICATION_FLAVOR_PKI_CONSOLE OR
+ APPLICATION_FLAVOR_DOGTAG_PKI_THEME OR
+ APPLICATION_FLAVOR_REDHAT_PKI_THEME)
find_package(Java REQUIRED)
find_package(JNI REQUIRED)
endif ()
diff --git a/scripts/compose_functions b/scripts/compose_functions
index 1cb48eb..75eee89 100644
--- a/scripts/compose_functions
+++ b/scripts/compose_functions
@@ -49,6 +49,9 @@ export PKI_BASE_DIR
PKI_DOGTAG_DIR="${PKI_DIR}/dogtag"
export PKI_DOGTAG_DIR
+PKI_REDHAT_DIR="${PKI_DIR}/redhat"
+export PKI_REDHAT_DIR
+
PKI_FILE_LIST="CMakeLists.txt COPYING CPackConfig.cmake ConfigureChecks.cmake DefineOptions.cmake README cmake_uninstall.cmake.in config.h.cmake pylint-build-scan.sh dogtag.pylintrc"
export PKI_FILE_LIST
@@ -61,6 +64,9 @@ export PKI_BASE_MANIFEST
PKI_DOGTAG_MANIFEST="CMakeLists.txt"
export PKI_DOGTAG_MANIFEST
+PKI_REDHAT_MANIFEST="CMakeLists.txt"
+export PKI_REDHAT_MANIFEST
+
RHEL="/rhel/"
##
commit 4d3049c36d8e6a5a0c999daaa6fdd856af00525c
Author: Endi S. Dewata <edewata at redhat.com>
Date: Wed Apr 22 18:33:11 2015 -0400
Added direct deployment for theme.
The deployment tool has been modified to deploy the theme files
directly from /usr/share/pki. New deployment descriptors have been
added for admin templates and JS library.
https://fedorahosted.org/pki/ticket/499
diff --git a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
index 3a4d3fa..ebcedc2 100644
--- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
+++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
@@ -60,7 +60,9 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
deployer.deploy_webapp(
"ROOT",
os.path.join(
- deployer.mdict['pki_tomcat_common_webapps_path'],
+ config.PKI_DEPLOYMENT_SOURCE_ROOT,
+ "server",
+ "webapps",
"ROOT"),
os.path.join(
deployer.mdict['pki_source_server_path'],
@@ -68,18 +70,46 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
"localhost",
"ROOT.xml"))
- # Deploy pki web application
+ # Deploy theme web application
deployer.deploy_webapp(
"pki",
- os.path.join(
- deployer.mdict['pki_tomcat_common_webapps_path'],
- "pki"),
+ deployer.mdict['pki_theme_server_dir'],
os.path.join(
deployer.mdict['pki_source_server_path'],
"Catalina",
"localhost",
"pki.xml"))
+ # Deploy admin templates
+ deployer.deploy_webapp(
+ "pki#admin",
+ os.path.join(
+ config.PKI_DEPLOYMENT_SOURCE_ROOT,
+ "server",
+ "webapps",
+ "pki",
+ "admin"),
+ os.path.join(
+ deployer.mdict['pki_source_server_path'],
+ "Catalina",
+ "localhost",
+ "pki#admin.xml"))
+
+ # Deploy JS library
+ deployer.deploy_webapp(
+ "pki#js",
+ os.path.join(
+ config.PKI_DEPLOYMENT_SOURCE_ROOT,
+ "server",
+ "webapps",
+ "pki",
+ "js"),
+ os.path.join(
+ deployer.mdict['pki_source_server_path'],
+ "Catalina",
+ "localhost",
+ "pki#js.xml"))
+
# establish Tomcat instance base
deployer.directory.create(deployer.mdict['pki_tomcat_common_path'])
deployer.directory.create(
@@ -99,26 +129,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
deployer.mdict['pki_instance_lib_log4j_properties'])
deployer.directory.create(deployer.mdict['pki_tomcat_tmpdir_path'])
- # Copy /usr/share/pki/server/webapps to <instance>/common/webapps
- deployer.directory.copy(
- os.path.join(
- config.PKI_DEPLOYMENT_SOURCE_ROOT,
- "server",
- "webapps"),
- deployer.mdict['pki_tomcat_common_webapps_path'])
-
- # If desired and available,
- # copy selected server theme
- # to <instance>/common/webapps/pki
- if config.str2bool(deployer.mdict['pki_theme_enable']) and\
- os.path.exists(deployer.mdict['pki_theme_server_dir']):
- deployer.directory.copy(
- deployer.mdict['pki_theme_server_dir'],
- os.path.join(
- deployer.mdict['pki_tomcat_common_webapps_path'],
- "pki"),
- overwrite_flag=True)
-
deployer.directory.create(deployer.mdict['pki_tomcat_work_path'])
deployer.directory.create(
deployer.mdict['pki_tomcat_work_catalina_path'])
diff --git a/base/server/tomcat7/conf/Catalina/localhost/ROOT.xml b/base/server/tomcat7/conf/Catalina/localhost/ROOT.xml
index ce98bfa..2a052f5 100644
--- a/base/server/tomcat7/conf/Catalina/localhost/ROOT.xml
+++ b/base/server/tomcat7/conf/Catalina/localhost/ROOT.xml
@@ -22,7 +22,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<Context crossContext="true" allowLinking="true">
+<Context docBase="/usr/share/pki/server/webapps/ROOT" crossContext="true" allowLinking="true">
<Manager
secureRandomProvider="Mozilla-JSS" secureRandomAlgorithm="pkcs11prng"/>
diff --git a/base/server/tomcat7/conf/Catalina/localhost/pki#admin.xml b/base/server/tomcat7/conf/Catalina/localhost/pki#admin.xml
new file mode 100644
index 0000000..e7f2e54
--- /dev/null
+++ b/base/server/tomcat7/conf/Catalina/localhost/pki#admin.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!-- BEGIN COPYRIGHT BLOCK
+ Copyright (C) 2012 Red Hat, Inc.
+ All rights reserved.
+ Modifications: configuration parameters
+ END COPYRIGHT BLOCK
+-->
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<Context docBase="/usr/share/pki/server/webapps/pki/admin" crossContext="true" allowLinking="true">
+
+ <Manager
+ secureRandomProvider="Mozilla-JSS" secureRandomAlgorithm="pkcs11prng"/>
+
+</Context>
diff --git a/base/server/tomcat7/conf/Catalina/localhost/pki#js.xml b/base/server/tomcat7/conf/Catalina/localhost/pki#js.xml
new file mode 100644
index 0000000..cef2f1c
--- /dev/null
+++ b/base/server/tomcat7/conf/Catalina/localhost/pki#js.xml
@@ -0,0 +1,30 @@
More information about the Pkg-freeipa-devel
mailing list