diff --git a/README.md b/README.md index ff6c3e4..7c28142 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,8 @@ ### Features - +* install required binaries and dependencies +* manage user ### Repo Structure @@ -33,6 +34,7 @@ ### Dependencies All dependencies must be included in the catalogue. +* [cd_resources](https://gitlab.puppetsoft.com/12WW1160/cd_resources) ### Deployment diff --git a/manifests/params.pp b/manifests/params.pp index 1716679..129fd35 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -24,15 +24,12 @@ class cd_apache::params ( $pkg_ensure = 'latest', +$reqpackages = ['httpd24','httpd24-mod_ssl'], +$ae_service = 'httpd24-httpd', ) { # installation section -$reqpackages = $::operatingsystem ? { - /(?i-mx:centos|fedora|redhat)/ => ['httpd24','httpd24-mod_ssl'], - } - -$ae_service = 'httpd' # includes must be last diff --git a/manifests/server/service.pp b/manifests/server/service.pp index bca07a4..6da5b0c 100644 --- a/manifests/server/service.pp +++ b/manifests/server/service.pp @@ -27,11 +27,10 @@ class cd_apache::server::service ( require cd_apache::server::files -# service { $ae_service: -# ensure => running, -# hasstatus => true, -# hasrestart => true, -# enable => true, -# } - + service { $ae_service: + ensure => running, + hasstatus => true, + hasrestart => true, + enable => true, + } } diff --git a/manifests/server/user.pp b/manifests/server/user.pp index b3a3f7b..a61bc82 100644 --- a/manifests/server/user.pp +++ b/manifests/server/user.pp @@ -27,4 +27,6 @@ class cd_apache::server::user ( require cd_apache::server::install + + }