diff options
| author | Christina Fu <cfu@redhat.com> | 2012-08-15 13:32:14 -0700 |
|---|---|---|
| committer | Christina Fu <cfu@redhat.com> | 2012-08-15 13:32:14 -0700 |
| commit | 7a5b5b06052a3432e1aec0aec8906cd5941f6fd9 (patch) | |
| tree | 052bc470521dc24b5aa0b3552e594dbe11a4d660 /base/setup/scripts/pki_apache_initscript | |
| parent | 3b1ca60d799ca02305b8a2c61eb279f74787cff0 (diff) | |
| parent | 7a6b89591732f872db38821c00ec3ce89ef57e7a (diff) | |
| download | pki-7a5b5b06052a3432e1aec0aec8906cd5941f6fd9.tar.gz pki-7a5b5b06052a3432e1aec0aec8906cd5941f6fd9.tar.xz pki-7a5b5b06052a3432e1aec0aec8906cd5941f6fd9.zip | |
Merge branch 'master' of git://git.fedorahosted.org/git/pki
Diffstat (limited to 'base/setup/scripts/pki_apache_initscript')
| -rwxr-xr-x | base/setup/scripts/pki_apache_initscript | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/base/setup/scripts/pki_apache_initscript b/base/setup/scripts/pki_apache_initscript index e51231065..c50c812a4 100755 --- a/base/setup/scripts/pki_apache_initscript +++ b/base/setup/scripts/pki_apache_initscript @@ -62,11 +62,6 @@ start() fi fi - touch ${pidfile} - chown ${PKI_USER}:${PKI_GROUP} ${pidfile} - chmod 00600 ${pidfile} - [ -x /sbin/restorecon ] && /sbin/restorecon ${pidfile} - # restore context for ncipher hsm [ -x /sbin/restorecon ] && [ -d /dev/nfast ] && /sbin/restorecon -R /dev/nfast @@ -74,13 +69,13 @@ start() rv=$? if [ ${rv} = 0 ] ; then if [ ${ARCHITECTURE} = "i386" ] ; then - LANG=${PKI_HTTPD_LANG} daemon runcon -t ${PKI_SELINUX_TYPE} -- ${httpd} ${PKI_OPTIONS} + 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} -- ${httpd} ${PKI_OPTIONS} + LANG=${PKI_HTTPD_LANG} runcon -t ${PKI_SELINUX_TYPE} -r system_r -- ${httpd} ${PKI_OPTIONS} rv=$? fi else |