summaryrefslogtreecommitdiffstats
path: root/base/server/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'base/server/scripts')
-rw-r--r--base/server/scripts/operations14
1 files changed, 11 insertions, 3 deletions
diff --git a/base/server/scripts/operations b/base/server/scripts/operations
index 5b5017891..907dd0ee1 100644
--- a/base/server/scripts/operations
+++ b/base/server/scripts/operations
@@ -30,11 +30,14 @@
# 200-254 reserved
#
-# Read default PKI configuration.
+# default PKI configuration
. /usr/share/pki/etc/pki.conf
-# Read user-defined PKI configuration.
-. /etc/pki/pki.conf
+# system-wide PKI configuration
+if [ -f /etc/pki/pki.conf ]
+then
+ . /etc/pki/pki.conf
+fi
default_error=0
@@ -1294,6 +1297,11 @@ EOF
/var/lib/pki/$PKI_INSTANCE_NAME/conf/custom.policy > \
/var/lib/pki/$PKI_INSTANCE_NAME/conf/catalina.policy
+ if [ "${PKI_SERVER_AUTO_ENABLE_SUBSYSTEMS}" = "true" ] ; then
+ # enable all subsystems
+ pki-server subsystem-enable -i "$PKI_INSTANCE_NAME" --all
+ fi
+
# We no longer start tomcat instances here.
# instead we rely on the tomcat unit scripts