From f4c092d2f027ce2a3492f1f4bad1c691b8d3d6e9 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sun, 17 Mar 2013 00:37:04 +0100
Subject: linting

---
 manifests/centos.pp         |  8 +++++---
 manifests/defaultphpdirs.pp | 22 ++++++++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)

(limited to 'manifests')

diff --git a/manifests/centos.pp b/manifests/centos.pp
index 930bbdd..69f11ab 100644
--- a/manifests/centos.pp
+++ b/manifests/centos.pp
@@ -6,7 +6,7 @@ class apache::centos inherits apache::package {
         name => 'httpd',
     }
     Service[apache]{
-        name => 'httpd',
+        name    => 'httpd',
         restart => '/etc/init.d/httpd graceful',
     }
     File[vhosts_dir]{
@@ -37,9 +37,11 @@ class apache::centos inherits apache::package {
           '/var/www/vhosts/[^/]*/non_public(/.*)?',
           '/var/www/vhosts/[^/]*/g2data(/.*)?',
           '/var/www/vhosts/[^/]*/upload(/.*)?' ]:
-          setype => 'httpd_sys_script_rw_t';
+          require => Package['apache'],
+          setype  => 'httpd_sys_script_rw_t';
         '/var/www/vhosts/[^/]*/logs(/.*)?':
-          setype => 'httpd_log_t';
+          require => Package['apache'],
+          setype  => 'httpd_log_t';
       }
     }
     file{'apache_service_config':
diff --git a/manifests/defaultphpdirs.pp b/manifests/defaultphpdirs.pp
index 93f7f1f..16561ac 100644
--- a/manifests/defaultphpdirs.pp
+++ b/manifests/defaultphpdirs.pp
@@ -1,21 +1,27 @@
+# setup some directories for php
 class apache::defaultphpdirs {
     file{
       '/var/www/upload_tmp_dir':
-        ensure => directory,
+        ensure  => directory,
         require => Package['apache'],
-        owner => root, group => 0, mode => 0755;
+        owner   => root,
+        group   => 0,
+        mode    => '0755';
       '/var/www/session.save_path':
-        ensure => directory,
+        ensure  => directory,
         require => Package['apache'],
-        owner => root, group => 0, mode => 0755;
+        owner   => root,
+        group   => 0,
+        mode    => '0755';
     }
 
     if $::selinux != 'false' {
       selinux::fcontext{
-        ['/var/www/upload_tmp_dir/.+(/.*)?',
-         '/var/www/session.save_path/.+(/.*)?']:
-          setype => 'httpd_sys_script_rw_t',
-          before => File['/var/www/upload_tmp_dir','/var/www/session.save_path'];
+        [ '/var/www/upload_tmp_dir/.+(/.*)?',
+          '/var/www/session.save_path/.+(/.*)?' ]:
+          require => Package['apache'],
+          setype  => 'httpd_sys_script_rw_t',
+          before  => File['/var/www/upload_tmp_dir','/var/www/session.save_path'];
       }
     }
 }
-- 
cgit v1.2.3