summaryrefslogtreecommitdiffstats
path: root/base/tps/shared/conf
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2016-03-21 21:40:02 +0100
committerEndi S. Dewata <edewata@redhat.com>2016-03-28 18:59:10 +0200
commit93179af9333197cbdce843f16c02107b8d1db17e (patch)
treea0311796ed3c168ad0997b24af457cd79576fba3 /base/tps/shared/conf
parentc22d9a99240d2f24eb7b0ee11c3153fa475d47a1 (diff)
downloadpki-93179af9333197cbdce843f16c02107b8d1db17e.tar.gz
pki-93179af9333197cbdce843f16c02107b8d1db17e.tar.xz
pki-93179af9333197cbdce843f16c02107b8d1db17e.zip
Generating TEMP_LOST to UNINITIALIZED/ACTIVE transitions dynamically.
The TPS subsystem has been modified to generate the token state transitions from TEMP_LOST to UNINITIALIZED or ACTIVE dynamically depending on whether the token has certificates. The TEMP_LOST to ACTIVE transition has been removed from the CS.cfg. Duplicate code that loads the allowed transitions list has been merged and moved into TPSSubsystem. https://fedorahosted.org/pki/ticket/1808
Diffstat (limited to 'base/tps/shared/conf')
-rw-r--r--base/tps/shared/conf/CS.cfg.in2
-rw-r--r--base/tps/shared/conf/token-states.properties1
2 files changed, 2 insertions, 1 deletions
diff --git a/base/tps/shared/conf/CS.cfg.in b/base/tps/shared/conf/CS.cfg.in
index 2285300ec..d7a10729d 100644
--- a/base/tps/shared/conf/CS.cfg.in
+++ b/base/tps/shared/conf/CS.cfg.in
@@ -1966,7 +1966,7 @@ tokendb.addConfigTemplate=addConfig.template
tokendb.addResultTemplate=addResults.template
tokendb.agentSelectConfigTemplate=agentSelectConfig.template
tokendb.agentViewConfigTemplate=agentViewConfig.template
-tokendb.allowedTransitions=0:1,0:2,0:3,0:6,3:2,3:4,3:6,4:1,4:2,4:3,4:6
+tokendb.allowedTransitions=0:1,0:2,0:3,0:6,3:2,3:6,4:1,4:2,4:3,4:6
tokendb.auditAdminTemplate=auditAdmin.template
tokendb.auditLog=[PKI_INSTANCE_PATH]/logs/tokendb-audit.log
tokendb.baseDN=ou=Tokens,[TOKENDB_ROOT]
diff --git a/base/tps/shared/conf/token-states.properties b/base/tps/shared/conf/token-states.properties
index f67688d4b..a64d940c6 100644
--- a/base/tps/shared/conf/token-states.properties
+++ b/base/tps/shared/conf/token-states.properties
@@ -15,6 +15,7 @@ UNINITIALIZED.TERMINATED = This token has been terminated.
TEMP_LOST.ACTIVE = This temporarily lost token has been found.
TEMP_LOST.PERM_LOST = This temporarily lost token has become permanently lost.
TEMP_LOST.TERMINATED = This temporarily lost token has been terminated.
+TEMP_LOST.UNINITIALIZED = This temporarily lost token has been found.
ACTIVE.DAMAGED = This token has been physically damaged.
ACTIVE.PERM_LOST = This token has been permanently lost.
ACTIVE.TEMP_LOST = This token has been temporarily lost.