tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor style cleanups for mythtv module.

Browse source
This commit is contained in:
Timo Mkinen 2012-08-01 10:53:49 +03:00
parent 811b7c0884
commit 4d7701ba9f
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
mythtv/manifests/init.pp
View file

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