diff options
| -rw-r--r-- | scripts/ca-master.cfg | 4 | ||||
| -rwxr-xr-x | scripts/ca-nuke.sh | 12 | ||||
| -rwxr-xr-x | scripts/ca-remove.sh | 7 | ||||
| -rwxr-xr-x | scripts/ca-start.sh | 4 | ||||
| -rwxr-xr-x | scripts/ca-stop.sh | 4 | ||||
| -rw-r--r-- | scripts/kra-master.cfg | 4 | ||||
| -rwxr-xr-x | scripts/kra-nuke.sh | 9 | ||||
| -rwxr-xr-x | scripts/kra-remove.sh | 7 | ||||
| -rwxr-xr-x | scripts/kra-start.sh | 4 | ||||
| -rwxr-xr-x | scripts/kra-stop.sh | 4 |
10 files changed, 31 insertions, 28 deletions
diff --git a/scripts/ca-master.cfg b/scripts/ca-master.cfg index 04cef32..7976aa7 100644 --- a/scripts/ca-master.cfg +++ b/scripts/ca-master.cfg @@ -45,10 +45,10 @@ pki_audit_signing_signing_algorithm=SHA256withRSA pki_audit_signing_subject_dn= pki_audit_signing_token= pki_backup_keys=False -pki_client_database_dir=/var/lib/pki/ca-master/certs +pki_client_database_dir=/var/lib/pki/ca-master/ca/certs pki_client_database_purge=False pki_client_dir= -pki_ds_base_dn=dc=ca-master,dc=example,dc=com +pki_ds_base_dn=dc=ca,dc=example,dc=com pki_ds_bind_dn=cn=Directory Manager pki_ds_database= pki_ds_hostname= diff --git a/scripts/ca-nuke.sh b/scripts/ca-nuke.sh index ef2d6f5..27a96f5 100755 --- a/scripts/ca-nuke.sh +++ b/scripts/ca-nuke.sh @@ -1,9 +1,9 @@ #!/bin/sh -x -INSTANCE=pki-master +INSTANCE_NAME=ca-master -rm -rf /etc/pki/$INSTANCE -rm -rf /var/lib/pki/$INSTANCE -rm -rf /etc/sysconfig/pki/tomcat/$INSTANCE -rm -rf /var/log/pki/$INSTANCE -rm -rf /etc/sysconfig/$INSTANCE +rm -rf /etc/pki/$INSTANCE_NAME +rm -rf /etc/sysconfig/$INSTANCE_NAME +rm -rf /etc/sysconfig/pki/tomcat/$INSTANCE_NAME +rm -rf /var/lib/pki/$INSTANCE_NAME +rm -rf /var/log/pki/$INSTANCE_NAME diff --git a/scripts/ca-remove.sh b/scripts/ca-remove.sh index 404767d..d29e313 100755 --- a/scripts/ca-remove.sh +++ b/scripts/ca-remove.sh @@ -4,10 +4,3 @@ SRC_DIR=`cd ../.. ; pwd` INSTANCE_NAME=ca-master pkidestroy -s CA -i $INSTANCE_NAME - -rm -rf /etc/pki/$INSTANCE_NAME -rm -rf /etc/sysconfig/$INSTANCE_NAME -rm -rf /etc/sysconfig/pki/tomcat/$INSTANCE_NAME -rm -rf /var/lib/pki/$INSTANCE_NAME -rm -rf /var/log/pki/$INSTANCE_NAME -rm -rf $SRC_DIR/certs/$INSTANCE_NAME diff --git a/scripts/ca-start.sh b/scripts/ca-start.sh index 93f1595..677b8e7 100755 --- a/scripts/ca-start.sh +++ b/scripts/ca-start.sh @@ -1,3 +1,5 @@ #!/bin/sh -x -systemctl start pki-tomcatd@ca-master.service +INSTANCE_NAME=ca-master + +systemctl start pki-tomcatd@$INSTANCE_NAME.service diff --git a/scripts/ca-stop.sh b/scripts/ca-stop.sh index fc7166e..66fd9f0 100755 --- a/scripts/ca-stop.sh +++ b/scripts/ca-stop.sh @@ -1,3 +1,5 @@ #!/bin/sh -x -systemctl stop pki-tomcatd@ca-master.service +INSTANCE_NAME=ca-master + +systemctl stop pki-tomcatd@$INSTANCE_NAME.service diff --git a/scripts/kra-master.cfg b/scripts/kra-master.cfg index 1500354..6d41da9 100644 --- a/scripts/kra-master.cfg +++ b/scripts/kra-master.cfg @@ -45,10 +45,10 @@ pki_audit_signing_signing_algorithm=SHA256withRSA pki_audit_signing_subject_dn= pki_audit_signing_token= pki_backup_keys=False -pki_client_database_dir=/var/lib/pki/kra-master/certs +pki_client_database_dir=/var/lib/pki/kra-master/kra/certs pki_client_database_purge=False pki_client_dir= -pki_ds_base_dn=dc=kra-master,dc=example,dc=com +pki_ds_base_dn=dc=kra,dc=example,dc=com pki_ds_bind_dn=cn=Directory Manager pki_ds_database= pki_ds_hostname= diff --git a/scripts/kra-nuke.sh b/scripts/kra-nuke.sh new file mode 100755 index 0000000..6d2a16f --- /dev/null +++ b/scripts/kra-nuke.sh @@ -0,0 +1,9 @@ +#!/bin/sh -x + +INSTANCE_NAME=kra-master + +rm -rf /etc/pki/$INSTANCE_NAME +rm -rf /etc/sysconfig/$INSTANCE_NAME +rm -rf /etc/sysconfig/pki/tomcat/$INSTANCE_NAME +rm -rf /var/lib/pki/$INSTANCE_NAME +rm -rf /var/log/pki/$INSTANCE_NAME diff --git a/scripts/kra-remove.sh b/scripts/kra-remove.sh index 1a08c91..b865456 100755 --- a/scripts/kra-remove.sh +++ b/scripts/kra-remove.sh @@ -4,10 +4,3 @@ SRC_DIR=`cd ../.. ; pwd` INSTANCE_NAME=kra-master pkidestroy -s KRA -i $INSTANCE_NAME - -rm -rf /etc/pki/$INSTANCE_NAME -rm -rf /etc/sysconfig/$INSTANCE_NAME -rm -rf /etc/sysconfig/pki/tomcat/$INSTANCE_NAME -rm -rf /var/lib/pki/$INSTANCE_NAME -rm -rf /var/log/pki/$INSTANCE_NAME -rm -rf $SRC_DIR/certs/$INSTANCE_NAME diff --git a/scripts/kra-start.sh b/scripts/kra-start.sh index 2776d23..2dd2b19 100755 --- a/scripts/kra-start.sh +++ b/scripts/kra-start.sh @@ -1,3 +1,5 @@ #!/bin/sh -x -systemctl start pki-tomcatd@kra-master.service +INSTANCE_NAME=kra-master + +systemctl start pki-tomcatd@$INSTANCE_NAME.service diff --git a/scripts/kra-stop.sh b/scripts/kra-stop.sh index e876dc0..cfa0780 100755 --- a/scripts/kra-stop.sh +++ b/scripts/kra-stop.sh @@ -1,3 +1,5 @@ #!/bin/sh -x -systemctl stop pki-tomcatd@kra-master.service +INSTANCE_NAME=kra-master + +systemctl stop pki-tomcatd@$INSTANCE_NAME.service |