From 4d7701ba9f840f78ae10a4adcf0894a71c97130f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Wed, 1 Aug 2012 10:53:49 +0300
Subject: [PATCH] Minor style cleanups for mythtv module.

---
 mythtv/manifests/init.pp | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/mythtv/manifests/init.pp b/mythtv/manifests/init.pp
index 5b37e87..6081f97 100644
--- a/mythtv/manifests/init.pp
+++ b/mythtv/manifests/init.pp
@@ -32,13 +32,14 @@ class mythtv::backend {
 
     include mysql::client
 
-    package { ["mythtv-backend",
-               "mythtv-setup",
-               "mythtv-docs",
-               "perl-DBD-MySQL", ]:
+    package { [
+          "mythtv-backend",
+          "mythtv-setup",
+          "mythtv-docs",
+          "perl-DBD-MySQL",
+        ]:
         ensure  => installed,
-        require => [ User["mythtv"],
-                     Group["mythtv"], ],
+        require => [ User["mythtv"], Group["mythtv"], ],
     }
 
     file { "/etc/mythtv/mysql.txt":
@@ -100,7 +101,9 @@ class mythtv::backend {
 #
 # This class should be included only to one host.
 #
-class mythtv::cron inherits mythtv::backend {
+class mythtv::cron {
+
+    require mythtv::backend
 
     package { [ "perl-MythTV", "perl-Net-UPnP" ]:
         ensure => installed,
@@ -139,19 +142,17 @@ class mythtv::mythweb {
         require => Package["mythweb"],
     }
 
-    if $selinux {
-        if $operatingsystem == "Fedora" {
-            if $operatingsystemrelease < 13 {
-                $context = "httpd_sys_content_rw_t"
-            } else {
-                $context = "httpd_sys_rw_content_t"
-            }
-        }
-        selinux::manage_fcontext { "/usr/share/mythweb/data(/.*)?":
-            type   => $context,
-            before => File["/usr/share/mythweb/data"],
+    if $::operatingsystem == "Fedora" {
+        if $::operatingsystemrelease < 13 {
+            $context = "httpd_sys_content_rw_t"
+        } else {
+            $context = "httpd_sys_rw_content_t"
         }
     }
+    selinux::manage_fcontext { "/usr/share/mythweb/data(/.*)?":
+        type   => $context,
+        before => File["/usr/share/mythweb/data"],
+    }
 
     if ! $apache::sslserver::group {
         fail("\$apache::sslserver::group not defined, include apache::sslserver class before mythtv::mythweb class")