diff options
author | Matthew Harmsen <mharmsen@redhat.com> | 2012-05-23 18:59:06 -0700 |
---|---|---|
committer | Matthew Harmsen <mharmsen@redhat.com> | 2012-05-25 14:59:48 -0700 |
commit | 4a263b8db27208413acd0f038ea67629d5ee27bb (patch) | |
tree | 8c747215e522100304e9afced96d0720bd49501d /base/setup/pkicommon.pm | |
parent | 2408bec41a56378fcf942a68a1ab290464c001d7 (diff) | |
download | pki-4a263b8db27208413acd0f038ea67629d5ee27bb.tar.gz pki-4a263b8db27208413acd0f038ea67629d5ee27bb.tar.xz pki-4a263b8db27208413acd0f038ea67629d5ee27bb.zip |
PKI Deployment Scriptlets
* Integration of Tomcat 7
* Addition of centralized 'pki-tomcatd' systemd functionality to the
PKI Deployment strategy
* Removal of 'pki_flavor' attribute
Diffstat (limited to 'base/setup/pkicommon.pm')
-rwxr-xr-x | base/setup/pkicommon.pm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/base/setup/pkicommon.pm b/base/setup/pkicommon.pm index b5ef8e140..4b68ffa7e 100755 --- a/base/setup/pkicommon.pm +++ b/base/setup/pkicommon.pm @@ -27,7 +27,7 @@ use Exporter; our @ISA = qw(Exporter); our @EXPORT = qw( $lib_prefix $obj_ext $path_sep $tmp_dir - $pki_flavor $pki_registry_path + $pki_registry_path $verbose $dry_run $hostname $default_hardware_platform $default_system_binaries $default_lockdir $default_system_libraries $default_system_user_binaries $default_system_user_libraries @@ -164,7 +164,6 @@ our %selinux_ports = (); # Shared Default Values ############################################################## -our $pki_flavor = undef; our $pki_registry_path = undef; our $default_hardware_platform = undef; @@ -204,11 +203,10 @@ my $is_IPv6 = 0; # Compute "hardware platform" of Operating System if ($^O eq "linux") { - $pki_flavor = "pki"; $default_registry_path = "/etc/sysconfig"; - $pki_registry_path = "$default_registry_path/$pki_flavor"; + $pki_registry_path = "$default_registry_path/pki"; $default_initscripts_path = "/etc/rc.d/init.d"; - $default_lockdir = "/var/lock/$pki_flavor"; + $default_lockdir = "/var/lock/pki"; $default_hardware_platform = `uname -i`; $default_hardware_platform =~ s/\s+$//g; chomp($default_hardware_platform); |