diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-05-22 22:34:58 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-05-23 21:03:20 +0200 |
| commit | 8016ed7972d9211e7f0db14e45bc9658a7b292ef (patch) | |
| tree | 581e4894afa88205489aa9f90cc1b5604f8f1808 /base/server/scripts | |
| parent | 0df4ba1372e0a5942806fda3b56f0b9ea70c6e05 (diff) | |
| download | pki-8016ed7972d9211e7f0db14e45bc9658a7b292ef.tar.gz pki-8016ed7972d9211e7f0db14e45bc9658a7b292ef.tar.xz pki-8016ed7972d9211e7f0db14e45bc9658a7b292ef.zip | |
Enabling all subsystems on startup.
The operations script has been modified to enable all subsystems
on startup by default. If the selftest fails, the subsystem will
be shutdown again automatically as before. A pki.conf option has
been added to configure this behavior.
https://pagure.io/dogtagpki/issue/2699
Change-Id: Iaf367ba2d88d73f377662eee5eafbb99e088ae50
Diffstat (limited to 'base/server/scripts')
| -rw-r--r-- | base/server/scripts/operations | 14 |
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 |