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

Migrated $httpd_user, $httpd_group, $httpsd_user and $httpsd_group variables to use format $apache::server::{user,group} and $apache::sslserver::{user,group}.

Browse source
This commit is contained in:
Timo Mkinen 2011-02-25 11:46:57 +02:00
parent 61b1501079
commit e3b6cca7a4
5 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

32
apache/manifests/init.pp
View file

@ -90,9 +90,29 @@ class apache::server inherits apache::common {
case $operatingsystem {
debian,ubuntu: {
if ! $httpd_user {
$user = "www-data"
} else {
$user = $httpd_user
}
if ! $httpd_group {
$group = "www-data"
} else {
$group = $httpd_group
}
include apache::debian::server
}
centos,fedora: {
if ! $httpd_user {
$user = "apache"
} else {
$user = $httpd_user
}
if ! $httpd_group {
$group = "apache"
} else {
$group = $httpd_group
}
include apache::redhat::server
}
default: {
@ -174,9 +194,21 @@ class apache::sslserver inherits apache::common {
case $operatingsystem {
debian,ubuntu: {
$user = "www-data"
$group = "www-data"
include apache::debian::sslserver
}
centos,fedora: {
if ! $httpsd_user {
$user = "httpsd"
} else {
$user = $httpsd_user
}
if ! $httpsd_group {
$group = "httpsd"
} else {
$group = $httpsd_group
}
include apache::redhat::sslserver
}
default: {

14
apache/manifests/redhat.pp
View file

@ -1,12 +1,5 @@
class apache::redhat::server {
if ! $httpd_user {
$httpd_user = "apache"
}
if ! $httpd_group {
$httpd_group = "apache"
}
file { [ "/etc/httpd/conf.http.d",
"/etc/httpd/site.http.d",
"/srv/www/http",
@ -122,13 +115,6 @@ define apache::redhat::site($aliases, $root, $redirect) {
class apache::redhat::sslserver {
if ! $httpsd_user {
$httpsd_user = "httpsd"
}
if ! $httpsd_group {
$httpsd_group = "httpsd"
}
package { "mod_ssl":
ensure => installed
}