diff options
author | Matthew Harmsen <mharmsen@redhat.com> | 2014-07-02 22:07:42 -0700 |
---|---|---|
committer | Matthew Harmsen <mharmsen@redhat.com> | 2014-07-03 14:36:52 -0700 |
commit | 958d0e9233b95823984081042e67d8f2b2599d4b (patch) | |
tree | 3c4dc44e87ee422200f7652589e17ba33ec3e98c /base/ca | |
parent | 8a27f6f01a43d9c30a20ea25c9fc40793c784a49 (diff) | |
download | pki-958d0e9233b95823984081042e67d8f2b2599d4b.tar.gz pki-958d0e9233b95823984081042e67d8f2b2599d4b.tar.xz pki-958d0e9233b95823984081042e67d8f2b2599d4b.zip |
Remove legacy 'systemctl' files
- PKI TRAC Ticket #832 - Remove legacy 'systemctl' files . . .
Diffstat (limited to 'base/ca')
-rw-r--r-- | base/ca/CMakeLists.txt | 33 | ||||
-rwxr-xr-x | base/ca/shared/etc/init.d/pki-cad | 87 | ||||
-rw-r--r-- | base/ca/shared/lib/systemd/system/pki-cad.target | 8 | ||||
-rw-r--r-- | base/ca/shared/lib/systemd/system/pki-cad@.service | 13 |
4 files changed, 0 insertions, 141 deletions
diff --git a/base/ca/CMakeLists.txt b/base/ca/CMakeLists.txt index 9c1616bac..025f7a132 100644 --- a/base/ca/CMakeLists.txt +++ b/base/ca/CMakeLists.txt @@ -4,30 +4,6 @@ add_subdirectory(src) add_subdirectory(setup) add_subdirectory(shared/conf) -# install systemd scripts -install( - FILES - shared/lib/systemd/system/pki-cad.target - shared/lib/systemd/system/pki-cad@.service - DESTINATION - ${SYSTEMD_LIB_INSTALL_DIR} - PERMISSIONS - OWNER_EXECUTE OWNER_WRITE OWNER_READ - GROUP_EXECUTE GROUP_READ - WORLD_EXECUTE WORLD_READ -) - -# install init script -install( - FILES - shared/etc/init.d/pki-cad - DESTINATION - ${SYSCONF_INSTALL_DIR}/rc.d/init.d - PERMISSIONS - OWNER_EXECUTE OWNER_WRITE OWNER_READ - GROUP_EXECUTE GROUP_READ -) - # install directories install( DIRECTORY @@ -37,11 +13,7 @@ install( PATTERN "CMakeLists.txt" EXCLUDE PATTERN - "etc/*" EXCLUDE - PATTERN "conf/CS.cfg.in" EXCLUDE - PATTERN - "lib/*" EXCLUDE ) # install empty directories @@ -57,8 +29,3 @@ install( ${VAR_INSTALL_DIR}/run/pki/ca ) -install( - DIRECTORY - DESTINATION - ${SYSTEMD_ETC_INSTALL_DIR}/pki-cad.target.wants -) diff --git a/base/ca/shared/etc/init.d/pki-cad b/base/ca/shared/etc/init.d/pki-cad deleted file mode 100755 index 772523287..000000000 --- a/base/ca/shared/etc/init.d/pki-cad +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/bash -# -# --- BEGIN COPYRIGHT BLOCK --- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Copyright (C) 2007-2010 Red Hat, Inc. -# All rights reserved. -# --- END COPYRIGHT BLOCK --- -# -# pki-cad Startup script for pki-ca with tomcat6 -# -# chkconfig: - 81 19 -# description: Certificate Authority (Tomcat 6.0) -# processname: pki-cad -# piddir: /var/run/pki/ca -# - -PROG_NAME=`basename $0` -SERVICE_NAME="pki-cad" -SERVICE_PROG="/sbin/service" -PKI_PATH="/usr/share/pki/ca" -PKI_REGISTRY="/etc/sysconfig/pki/ca" -PKI_TYPE="pki-ca" -PKI_TOTAL_PORTS=7 - -# Avoid using 'systemctl' for now -SYSTEMCTL_SKIP_REDIRECT=1 -export SYSTEMCTL_SKIP_REDIRECT - -# Disallow 'others' the ability to 'write' to new files -umask 00002 - -command="$1" -pki_instance="$2" - -# Source function library. -. /etc/init.d/functions - -# Source the PKI function library -. /usr/share/pki/scripts/functions - -# See how we were called. -case $command in - status) - registry_status - exit $? - ;; - start) - start - exit $? - ;; - restart) - restart - exit $? - ;; - stop) - stop - exit $? - ;; - condrestart|force-restart|try-restart) - [ ! -f ${lockfile} ] || restart - exit $? - ;; - reload) - echo "The 'reload' action is an unimplemented feature." - exit ${default_error} - ;; - *) - echo "unknown action ($command)" - usage - echo "where valid instance names include:" - list_instances - exit ${default_error} - ;; -esac - diff --git a/base/ca/shared/lib/systemd/system/pki-cad.target b/base/ca/shared/lib/systemd/system/pki-cad.target deleted file mode 100644 index dab661403..000000000 --- a/base/ca/shared/lib/systemd/system/pki-cad.target +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=PKI Certificate Authority Server -After=syslog.target network.target - -[Install] -WantedBy=multi-user.target - - diff --git a/base/ca/shared/lib/systemd/system/pki-cad@.service b/base/ca/shared/lib/systemd/system/pki-cad@.service deleted file mode 100644 index e205d72fb..000000000 --- a/base/ca/shared/lib/systemd/system/pki-cad@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=PKI Certificate Authority Server %i -After=pki-cad.target -BindTo=pki-cad.target - -[Service] -Type=forking -ExecStart=/usr/bin/pkicontrol start ca %i -ExecStop=/usr/bin/pkicontrol stop ca %i - -[Install] -WantedBy=multi-user.target - |