From 972c9a059f082123d38624385f0c973ba66efde1 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Mon, 19 Jun 2017 14:42:52 +0100 Subject: [PATCH] changed package selection --- manifests/params.pp | 20 +++++++++++++++++--- manifests/server/user.pp | 6 ++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 129fd35..fd939d1 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -23,14 +23,28 @@ class cd_apache::params ( -$pkg_ensure = 'latest', -$reqpackages = ['httpd24','httpd24-mod_ssl'], -$ae_service = 'httpd24-httpd', +$pkg_ensure = 'latest', + +$ae_manage_user = false, + +$ae_user_name = 'apache', +$ae_user_uid = '48', +$ae_u_comment = 'Apache Service User', +$ae_u_groups = undef, +$ae_user_home = '/home/apache', +$ae_user_shell = '/bin/false', ) { # installation section +$reqpackages = $::operatingsystem ? { + /(?i-mx:centos|fedora|redhat)/ => ['httpd','mod_ssl'], + } + +# service +$ae_service = 'httpd', + # includes must be last include cd_apache::main::config diff --git a/manifests/server/user.pp b/manifests/server/user.pp index a61bc82..bde635c 100644 --- a/manifests/server/user.pp +++ b/manifests/server/user.pp @@ -27,6 +27,12 @@ class cd_apache::server::user ( require cd_apache::server::install + if $ae_manage_user == true { + + + + + } }