From 391d345b5a6a1a905e3db4105a65dd4fdd0d19a9 Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Fri, 4 May 2012 20:29:35 -0700 Subject: PKI Deployment Scriptlets * Re-aligned code to account for revised layout documented at http://pki.fedoraproject.org/wiki/PKI_Instance_Deployment * Massaged logic to comply with PKI subsystem running within a shared instance * Developed code to take advantage of a single shared NSS security database model * Completed the following two 'scriptlets': * Dogtag 10: Python 'slot_assignment.py' Installation Scriptlet (https://fedorahosted.org/pki/ticket/146) * Dogtag 10: Python 'security_databases.py' Installation Scriptlet (https://fedorahosted.org/pki/ticket/136) * Created several additional PKI deployment helper utilities. --- base/deploy/src/scriptlets/pkiconfig.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'base/deploy/src/scriptlets/pkiconfig.py') diff --git a/base/deploy/src/scriptlets/pkiconfig.py b/base/deploy/src/scriptlets/pkiconfig.py index 505bfc039..31b05312c 100644 --- a/base/deploy/src/scriptlets/pkiconfig.py +++ b/base/deploy/src/scriptlets/pkiconfig.py @@ -27,6 +27,7 @@ import logging PKI_DEPLOYMENT_DEFAULT_DIR_PERMISSIONS = 00770 PKI_DEPLOYMENT_DEFAULT_EXE_PERMISSIONS = 00770 PKI_DEPLOYMENT_DEFAULT_FILE_PERMISSIONS = 00660 +PKI_DEPLOYMENT_DEFAULT_SECURITY_DATABASE_PERMISSIONS = 00600 PKI_DEPLOYMENT_DEFAULT_SGID_DIR_PERMISSIONS = 02770 PKI_DEPLOYMENT_DEFAULT_SYMLINK_PERMISSIONS = 00777 PKI_DEPLOYMENT_DEFAULT_UMASK = 00002 @@ -52,15 +53,21 @@ PKI_INDENTATION_LEVEL_4 = {'indent' : '............... '} # in the configuration file (the value in the default configuration file # should always match the 'default' instance name specified below). PKI_DEPLOYMENT_REGISTRY_ROOT = "/etc/sysconfig/pki" -PKI_DEPLOYMENT_DEFAULT_INSTANCE_NAME = "instance" +PKI_DEPLOYMENT_DEFAULT_INSTANCE_NAME = "default" PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE = "pkideployment.cfg" +PKI_DEPLOYMENT_SLOTS_CONFIGURATION_FILE =\ + "/usr/share/pki/deployment/config/pkislots.cfg" # NOTE: Top-level "/etc/pki" is owned by the "filesystem" package! PKI_SHARED_CONFIGURATION_ROOT = "/etc/pki" # PKI Deployment Global Variables +pki_install_time = None pki_timestamp = None +pki_hostname = None +pki_pin = None +pki_one_time_pin = None # PKI Deployment "Mandatory" Command-Line Variables @@ -92,3 +99,4 @@ pki_common_dict = None pki_web_server_dict = None pki_subsystem_dict = None pki_master_dict = None +pki_slots_dict = None -- cgit