Remove dtomcat5

dtomcat5 was a private copy of a system supplied initscript. We should
never make private copies of files supplied by other packages
otherwise we get out of sync, especially with respect to bug fixes.

In any event dtomcat5 does not even exist in tomcat6 (nor an
equivalent).

With tomcat6 we're going to use the initscript supplied by the tomcat6
package. We are not going to modify files supplied by other packages!
tomcat6 has an easy mechanism to launch tomcat6 instances. You create
a symlink in /etc/init.d (e.g. /etc/rc.d/init.d) which points to the
tomcat6 initscript. When the tomcat6 initscript is invoked it gets the
basename of the script, because it's a symlink it will be the name of
the instance. That name is then used to read a tomcat6 config file in
/etc/sysconfig. This way you can create a variety of tomcat6 daemons
and launch them with the standard system tools/files and never once
need to modify any file provided by the tomcat6 package!


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

1 files changed, 0 insertions, 26 deletions

diff --git a/pki/base/setup/pkicreate b/pki/base/setup/pkicreate
index c62f8082a..dffe275e3 100755
--- a/pki/base/setup/pkicreate
+++ b/pki/base/setup/pkicreate
@@ -239,7 +239,6 @@ my $addTokens_ldif_base_name     = "addTokens.ldif";       # TPS
 my $addVLVIndexes_ldif_base_name = "addVLVIndexes.ldif";   # TPS
 my $apachectl_base_name          = "apachectl";            # TPS
 my $nss_pcache_base_name         = "nss_pcache";           # RA, TPS
-my $catalina_sh_base_name        = "dtomcat5";             # CA, KRA, OCSP, TKS
 my $certsrv_jar_base_name        = "certsrv.jar";          # CA, KRA, OCSP, TKS
 my $nsutil_jar_base_name         = "nsutil.jar";           # CA, KRA, OCSP, TKS
 my $cmsutil_jar_base_name        = "cmsutil.jar";          # CA, KRA, OCSP, TKS
@@ -503,8 +502,6 @@ my $addVLVIndexes_ldif_instance_file_path     = "";  # TPS
 my $addVLVIndexes_ldif_subsystem_file_path    = "";  # TPS
 my $apachectl_instance_file_path              = "";  # TPS
 my $apachectl_subsystem_file_path             = "";  # TPS
-my $catalina_sh_instance_file_path            = "";  # CA, KRA, OCSP, TKS
-my $catalina_sh_subsystem_file_path           = "";  # CA, KRA, OCSP, TKS
 my $certsrv_jar_file_path                     = "";  # CA, KRA, OCSP, TKS
 my $certsrv_jar_symlink_path                  = "";  # CA, KRA, OCSP, TKS
 my $cms_jar_file_path                         = "";  # CA, KRA, OCSP, TKS
@@ -1808,11 +1805,6 @@ sub initialize_subdirectory_paths()
                                          . "/" . $lib_base_instance_dir;
         $java_pki_flavor_jar_path           = $default_java_path
                                             . "/" . $pki_flavor;
-        $catalina_sh_instance_file_path    = $default_system_user_binaries
-                                           . "/" . $catalina_sh_base_name
-                                           . "-" . $pki_instance_name;
-        $catalina_sh_subsystem_file_path   = $conf_subsystem_path
-                                           . "/" . $catalina_sh_base_name;
         $certsrv_jar_file_path             = $java_pki_flavor_jar_path
                                            . "/" . $certsrv_jar_base_name;
         $certsrv_jar_symlink_path          = $webinf_lib_instance_path
@@ -2742,14 +2734,6 @@ LoadModule nss_module  /opt/fortitude/modules.local/libmodnss.so
 
     } else {
         ## Process templates (CA, KRA, OCSP, TKS instances)
-        # process "catalina.sh" (aka dtomcat5) template
-        return 0 if !process_file_template("catalina_sh",
-                                           $catalina_sh_subsystem_file_path,
-                                           $catalina_sh_instance_file_path,
-                                           \%slot_hash);
-        return 0 if !set_file_props($catalina_sh_instance_file_path,
-                                    $default_exe_permissions, $pki_user, $pki_group);
-
         # process "index.html" template
         return 0 if !process_file_template("index_html",
                                            $index_html_subsystem_file_path,
@@ -3681,16 +3665,6 @@ sub process_pki_selinux_setup()
     }
     emit("Restorecon file context for /usr/share/pki\n");
     system("$restorecon -F -R /usr/share/pki");
-
-    # set file context for /usr/bin/dtomcat5-$pki_instance_name
-    if ($java_component) {
-        if ($pki_instance_name ne $default_inst_name) {
-            &add_selinux_file_context($setype . "_exec_t",  
-                "/usr/bin/dtomcat5-$pki_instance_name", "f");
-        } 
-        emit("restorecon file context for /usr/bin/dtomcat5-$pki_instance_name\n");
-        system("$restorecon -F -R /usr/bin/dtomcat5-$pki_instance_name");
-    }
  
     # 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)) {