Merged in oherrala/puppet/oherrala-apache-user (pull request #48)

apache: Create httpsd user and group if no other user is defined for sslserver.
This commit is contained in:
Timo Mäkinen 2014-02-27 15:32:37 +02:00
commit 6a595c436f

View file

@ -225,6 +225,8 @@ define apache::site($aliases="", $root="", $redirect="", $proxy="") {
# #
class apache::sslserver inherits apache::common { class apache::sslserver inherits apache::common {
include user::system
case $::operatingsystem { case $::operatingsystem {
"debian","ubuntu": { "debian","ubuntu": {
include apache::debian::sslserver include apache::debian::sslserver
@ -232,11 +234,13 @@ class apache::sslserver inherits apache::common {
"centos","redhat","fedora": { "centos","redhat","fedora": {
if ! $httpsd_user { if ! $httpsd_user {
$user = "httpsd" $user = "httpsd"
realize(User["httpsd"])
} else { } else {
$user = $httpsd_user $user = $httpsd_user
} }
if ! $httpsd_group { if ! $httpsd_group {
$group = "httpsd" $group = "httpsd"
realize(Group["httpsd"])
} else { } else {
$group = $httpsd_group $group = $httpsd_group
} }