summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-10-04 13:02:16 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-10-04 13:02:16 -0500
commit423d7650e89cbfa36b6744b11637760f0b410453 (patch)
treea7a8b2cb21b5f99dffb1577fbe5172178829ef62
parent0983b75b09f200b5c59a1f1b3282b4868568195d (diff)
downloadpki-dev-423d7650e89cbfa36b6744b11637760f0b410453.tar.gz
pki-dev-423d7650e89cbfa36b6744b11637760f0b410453.tar.xz
pki-dev-423d7650e89cbfa36b6744b11637760f0b410453.zip
Updated CA scripts.
-rwxr-xr-xscripts/ca-include.sh2
-rwxr-xr-xscripts/ca-run.sh4
-rwxr-xr-xscripts/caclone-configure.sh2
3 files changed, 5 insertions, 3 deletions
diff --git a/scripts/ca-include.sh b/scripts/ca-include.sh
index 8d2c454..5127c53 100755
--- a/scripts/ca-include.sh
+++ b/scripts/ca-include.sh
@@ -26,7 +26,7 @@ CA_TOMCAT_SERVER_PORT="9701"
CA_LDAP_HOST="$HOSTNAME"
CA_LDAP_PORT="389"
CA_LDAP_DATABASE="$DOMAIN-$INSTANCE_NAME"
-CA_LDAP_BASE_DN="ou=ca,dc=example,dc=com"
+CA_LDAP_BASE_DN="dc=ca,dc=example,dc=com"
CA_LDAP_BIND_DN="cn=Directory Manager"
CA_LDAP_PASSWORD="$PASSWORD"
diff --git a/scripts/ca-run.sh b/scripts/ca-run.sh
index 6da71c2..105f5c4 100755
--- a/scripts/ca-run.sh
+++ b/scripts/ca-run.sh
@@ -2,4 +2,6 @@
INSTANCE_NAME=ca-master
-java -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n -classpath :/usr/share/tomcat/bin/bootstrap.jar:/usr/share/tomcat/bin/tomcat-juli.jar:/usr/share/java/commons-daemon.jar -Dcatalina.base=/var/lib/pki/$INSTANCE_NAME -Dcatalina.home=/usr/share/tomcat -Djava.endorsed.dirs= -Djava.io.tmpdir=/var/lib/pki/$INSTANCE_NAME/temp -Djava.util.logging.config.file=/var/lib/pki/$INSTANCE_NAME/conf/logging.properties -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager org.apache.catalina.startup.Bootstrap start
+java -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n -classpath :/usr/share/tomcat/bin/bootstrap.jar:/usr/share/tomcat/bin/tomcat-juli.jar:/usr/share/java/commons-daemon.jar -Dcatalina.base=/var/lib/pki/$INSTANCE_NAME -Dcatalina.home=/usr/share/tomcat -Djava.endorsed.dirs= -Djava.io.tmpdir=/var/lib/pki/$INSTANCE_NAME/temp org.apache.catalina.startup.Bootstrap start
+
+#java -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n -classpath :/usr/share/tomcat/bin/bootstrap.jar:/usr/share/tomcat/bin/tomcat-juli.jar:/usr/share/java/commons-daemon.jar -Dcatalina.base=/var/lib/pki/$INSTANCE_NAME -Dcatalina.home=/usr/share/tomcat -Djava.endorsed.dirs= -Djava.io.tmpdir=/var/lib/pki/$INSTANCE_NAME/temp -Djava.util.logging.config.file=/var/lib/pki/$INSTANCE_NAME/conf/logging.properties -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager org.apache.catalina.startup.Bootstrap start
diff --git a/scripts/caclone-configure.sh b/scripts/caclone-configure.sh
index 34ed6cc..fe9af29 100755
--- a/scripts/caclone-configure.sh
+++ b/scripts/caclone-configure.sh
@@ -34,7 +34,7 @@ pkisilent ConfigureCA \
-sd_admin_password "$PASSWORD" \
-ldap_host "localhost" \
-ldap_port "390" \
- -base_dn "ou=ca,dc=example,dc=com" \
+ -base_dn "dc=ca,dc=example,dc=com" \
-db_name "example.com-$INSTANCE_NAME" \
-bind_dn "cn=Directory Manager" \
-bind_password "$PASSWORD" \