Skip to content

split out service so we can use file standalone #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thomasvs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

split out service so we can use file standalone #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions manifests/file.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
$source = undef,
$content = undef,
) {

include ::apache_httpd::install
include ::apache_httpd::service

file { "${confd}/${title}":
ensure => $ensure,
owner => $owner,
Expand Down
11 changes: 3 additions & 8 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
) inherits ::apache_httpd::params {

include '::apache_httpd::install'
class { '::apache_httpd::service':
service_restart => $service_restart
}

# Our own pre-configured file (disable nearly everything)
file { '/etc/httpd/conf/httpd.conf':
Expand Down Expand Up @@ -146,14 +149,6 @@
content => template("${module_name}/logrotate.erb"),
}

# Main service
service { 'httpd':
ensure => running,
enable => true,
restart => $service_restart,
hasstatus => true,
require => Package['httpd'],
}
if $ssl {
package { 'mod_ssl':
ensure => installed,
Expand Down
19 changes: 19 additions & 0 deletions manifests/service.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Class: apache_httpd::service
#
# Apache httpd web server service class.
#
class apache_httpd::service (
$service_restart = $::apache_httpd::params::service_restart,
) {

include '::apache_httpd::install'

# Main service
service { 'httpd':
ensure => running,
enable => true,
restart => $service_restart,
hasstatus => true,
require => Package['httpd'],
}
}