1 files changed, 52 insertions, 12 deletions
diff --git a/manifests/centos.pp b/manifests/centos.pp
index cb47adc..caf46ce 100644
--- a/manifests/centos.pp
+++ b/manifests/centos.pp
@@ -6,36 +6,76 @@ class apache::centos inherits apache::package {
         name => 'httpd',
     }
     Service[apache]{
-        name => 'httpd',
+        name    => 'httpd',
         restart => '/etc/init.d/httpd graceful',
     }
     File[vhosts_dir]{
-        path => "$config_dir/vhosts.d",
+        path => "${config_dir}/vhosts.d",
     }
     File[config_dir]{
-        path => "$config_dir/conf.d",
+        path => "${config_dir}/conf.d",
     }
     File[include_dir]{
-        path => "$config_dir/include.d",
+        path => "${config_dir}/include.d",
     }
     File[modules_dir]{
-        path => "$config_dir/modules.d",
+        path => "${config_dir}/modules.d",
     }
     File[web_dir]{
-        path => "/var/www/vhosts",
+        path => '/var/www/vhosts',
     }
     File[default_apache_index]{
         path => '/var/www/html/index.html',
     }
 
+    if $::selinux != 'false' {
+      Selinux::Fcontext{
+        before => File[web_dir],
+      }
+      $seltype_rw = $::lsbmajdistrelease ? {
+        5 => 'httpd_sys_script_rw_t',
+        default => 'httpd_sys_rw_content_t'
+      }
+      selinux::fcontext{
+        [ '/var/www/vhosts/[^/]*/www(/.*)?',
+          '/var/www/vhosts/[^/]*/non_public(/.*)?',
+          '/var/www/vhosts/[^/]*/g2data(/.*)?',
+          '/var/www/vhosts/[^/]*/upload(/.*)?' ]:
+          require => Package['apache'],
+          setype  => $seltype_rw;
+        '/var/www/vhosts/[^/]*/logs(/.*)?':
+          require => Package['apache'],
+          setype  => 'httpd_log_t';
+      }
+    }
     file{'apache_service_config':
-        path => '/etc/sysconfig/httpd',
-        source => [ "puppet://$server/modules/site-apache/service/CentOS/${fqdn}/httpd",
-                    "puppet://$server/modules/site-apache/service/CentOS/httpd",
-                    "puppet://$server/modules/apache/service/CentOS/httpd" ],
+        path    => '/etc/sysconfig/httpd',
+        source  => [  "puppet:///modules/site_apache/service/CentOS/${::fqdn}/httpd",
+                      'puppet:///modules/site_apache/service/CentOS/httpd',
+                      'puppet:///modules/apache/service/CentOS/httpd' ],
+        require => Package['apache'],
+        notify  => Service['apache'],
+        owner   => root,
+        group   => 0,
+        mode    => '0644';
+    }
+
+    # this is for later fixes
+    exec{
+      'adjust_pidfile':
+        command => 'sed -i  "s/^#PidFile \(.*\)/PidFile \1/g" /etc/httpd/conf/httpd.conf',
+        unless  => 'grep -qE \'^PidFile \' /etc/httpd/conf/httpd.conf',
+        require => Package['apache'],
+        notify  => Service['apache'];
+      'adjust_listen':
+        command => 'sed -i  "s/^#Listen 80/Listen 80/g" /etc/httpd/conf/httpd.conf',
+        unless  => 'grep -qE \'^Listen 80\' /etc/httpd/conf/httpd.conf',
         require => Package['apache'],
-        notify => Service['apache'],
-        owner => root, group => 0, mode => 0644;
+        notify  => Service['apache'];
+    }
+
+    apache::config::global{'00-listen.conf':
+      ensure => absent,
     }
 
     include apache::logrotate::centos