diff options
| author | mh <mh@immerda.ch> | 2008-05-09 19:06:28 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2008-05-09 19:06:28 +0000 |
| commit | e3e90c9e19fc0f767d6e2612c498a1288f849430 (patch) | |
| tree | c2e19945f428d641ba9666743e570bc5f4d16671 | |
| parent | 4cf7a843066e4cd1c99ad149a45eeebd094b6963 (diff) | |
merged puzzle
| -rw-r--r-- | files/vhosts.d/00_default_centos_vhost.conf | 4 | ||||
| -rw-r--r-- | manifests/selinux.pp | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/files/vhosts.d/00_default_centos_vhost.conf b/files/vhosts.d/00_default_centos_vhost.conf index b63640f..0a5c6a2 100644 --- a/files/vhosts.d/00_default_centos_vhost.conf +++ b/files/vhosts.d/00_default_centos_vhost.conf @@ -21,8 +21,8 @@ SSLCipherSuite HIGH:MEDIUM:!ADH:-SSLv2 - SSLCertificateFile /e/certs/server.crt - SSLCertificateKeyFile /e/certs/server.key + SSLCertificateFile /etc/pki/tls/certs/localhost.crt + SSLCertificateKeyFile /etc/pki/tls/private/localhost.key <Files ~ "\.(cgi|shtml|phtml|php3?)$"> SSLOptions +StdEnvVars </Files> diff --git a/manifests/selinux.pp b/manifests/selinux.pp index aec1774..7518bfa 100644 --- a/manifests/selinux.pp +++ b/manifests/selinux.pp @@ -11,6 +11,9 @@ class apache::selinux { class apache::selinux::base {} class apache::selinux::gentoo inherits apache::selinux::base { + package{'selinux-apache': + ensure => present, + category => 'sec-policy', + } selinux::loadmodule {"apache": location => "/usr/share/selinux/${selinux_mode}/apache.pp" } - gentoo::installselinuxpackage { "selinux-apache": } } |