diff options
Diffstat (limited to 'base/setup/scripts')
| -rwxr-xr-x | base/setup/scripts/pki_apache_initscript | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/base/setup/scripts/pki_apache_initscript b/base/setup/scripts/pki_apache_initscript index c50c812a4..1e411207f 100755 --- a/base/setup/scripts/pki_apache_initscript +++ b/base/setup/scripts/pki_apache_initscript @@ -64,25 +64,16 @@ start() # restore context for ncipher hsm [ -x /sbin/restorecon ] && [ -d /dev/nfast ] && /sbin/restorecon -R /dev/nfast - - /usr/sbin/selinuxenabled - rv=$? - if [ ${rv} = 0 ] ; then - if [ ${ARCHITECTURE} = "i386" ] ; then - LANG=${PKI_HTTPD_LANG} daemon runcon -t ${PKI_SELINUX_TYPE} -r system_r -- ${httpd} ${PKI_OPTIONS} - rv=$? - # overwrite output from "daemon" - echo -n $"Starting ${prog}: " - elif [ ${ARCHITECTURE} = "x86_64" ] ; then - # NOTE: "daemon" is incompatible with "httpd" on 64-bit architectures - LANG=${PKI_HTTPD_LANG} runcon -t ${PKI_SELINUX_TYPE} -r system_r -- ${httpd} ${PKI_OPTIONS} - rv=$? - fi + + if [ ${ARCHITECTURE} = "x86_64" ] ; then + # NOTE: "daemon" is incompatible with "httpd" on 64-bit architectures + LANG=${PKI_HTTPD_LANG} ${httpd} ${PKI_OPTIONS} + rv=$? else - LANG=${PKI_HTTPD_LANG} daemon ${httpd} ${PKI_OPTIONS} + LANG=${PKI_HTTPD_LANG} daemon ${httpd} ${PKI_OPTIONS} rv=$? - # overwrite output from "daemon" - echo -n $"Starting ${prog}: " + # overwrite output from "daemon" + echo -n $"Starting ${prog}: " fi if [ ${rv} = 0 ] ; then |