fix use of default instance names

It wasn't initialized in some places. Use the same naming convention
in all places.


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1568 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

2 files changed, 9 insertions, 9 deletions

diff --git a/pki/base/setup/pkicreate b/pki/base/setup/pkicreate
index 11cf3b362..cfdb6d9bf 100755
--- a/pki/base/setup/pkicreate
+++ b/pki/base/setup/pkicreate
@@ -2915,8 +2915,8 @@ sub process_pki_selinux_setup
 {
     my $setype = "pki_" . $subsystem_type;
     my $setype_p = $setype . "_port_t";
-    my $default_inst_name = "pki-" . $subsystem_type;
-    my $default_inst_root = "/var/lib";
+    my $default_instance_name = "pki-" . $subsystem_type;
+    my $default_instance_root = "/var/lib";
     my $default_log_path = "/var/log/" . $default_instance_name;
     my $default_conf_path = "/etc/" . $default_instance_name;
     my $status = 0;
@@ -2956,7 +2956,7 @@ sub process_pki_selinux_setup
     run_command("$restorecon -F -R /usr/share/pki");
  
     # set file context for $pki_instance_root/$pki_instance_name
-    if (($pki_instance_name ne $default_inst_name) || ($pki_instance_root ne $default_inst_root)) {
+    if (($pki_instance_name ne $default_instance_name) || ($pki_instance_root ne $default_instance_root)) {
         add_selinux_file_context($setype . "_var_lib_t", 
                                  "\"${pki_instance_root}/${pki_instance_name}(/.*)?\"", "a");
     }
@@ -2967,7 +2967,7 @@ sub process_pki_selinux_setup
     if ($java_component) {
         # set file context for instance pid file
         my $pidfile = $tomcat6_instance_pid_file_path;
-        if ($pki_instance_name ne $default_inst_name) {
+        if ($pki_instance_name ne $default_instance_name) {
             add_selinux_file_context($setype . "_var_run_t",
                 $pidfile, "f");
         }
diff --git a/pki/base/setup/pkiremove b/pki/base/setup/pkiremove
index 8e180899b..f07ea4536 100755
--- a/pki/base/setup/pkiremove
+++ b/pki/base/setup/pkiremove
@@ -349,8 +349,8 @@ sub remove_fcontext
 sub remove_selinux_fcontexts
 {
     my $setype = "pki_" . $subsystem_type;
-    my $default_inst_name = "pki-" . $subsystem_type;
-    my $default_inst_root = "/var/lib";
+    my $default_instance_name = "pki-" . $subsystem_type;
+    my $default_instance_root = "/var/lib";
     my $default_log_path = "/var/log/" . $default_instance_name;
     my $default_conf_path = "/etc/" . $default_instance_name;
 
@@ -378,20 +378,20 @@ sub remove_selinux_fcontexts
     # which use the legacy start/stop implementation
     if (entity_exists("$default_initscripts_path/$pki_instance_name")) {
         # remove context for "$default_initscripts_path/$pki_instance_name"
-        if ($pki_instance_name ne $default_inst_name) {
+        if ($pki_instance_name ne $default_instance_name) {
             remove_fcontext($setype . "_script_exec_t", 
                               "/etc/rc\\.d/init\\.d/$pki_instance_name", "f");
         }
     }
 
     # remove context for $pki_instance_root/$pki_instance_name
-    if (($pki_instance_name ne $default_inst_name) || ($pki_instance_root ne $default_inst_root)) {
+    if (($pki_instance_name ne $default_instance_name) || ($pki_instance_root ne $default_instance_root)) {
         remove_fcontext($setype . "_var_lib_t", 
             "\"$pki_instance_root/$pki_instance_name(/.*)?\"", "a");
     }
 
     # remove context for /var/run/$pki_instance_name.pid
-    if (($java_component) && ($pki_instance_name ne $default_inst_name)) {
+    if (($java_component) && ($pki_instance_name ne $default_instance_name)) {
         remove_fcontext($setype . "_var_run_t", 
             "/var/run/$pki_instance_name\\.pid", "f");
     }