diff options
| author | mh <mh@immerda.ch> | 2012-11-27 15:26:30 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-11-27 15:26:30 +0100 |
| commit | d55e4605f5b3a91e468bc9d1168531b9e590d8e1 (patch) | |
| tree | e42da07441539c5cc82236276ecc630dc74e0962 /manifests/centos.pp | |
| parent | 147a5ed602ef8084596ec715a08c6b05557e39ab (diff) | |
linting
Diffstat (limited to 'manifests/centos.pp')
| -rw-r--r-- | manifests/centos.pp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/manifests/centos.pp b/manifests/centos.pp index 7afb69d..2ad521e 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -22,7 +22,7 @@ class apache::centos inherits apache::package { path => "${config_dir}/modules.d", } File[web_dir]{ - path => "/var/www/vhosts", + path => '/var/www/vhosts', } File[default_apache_index]{ path => '/var/www/html/index.html', @@ -43,27 +43,29 @@ class apache::centos inherits apache::package { } } file{'apache_service_config': - path => '/etc/sysconfig/httpd', - source => [ "puppet:///modules/site_apache/service/CentOS/${::fqdn}/httpd", - "puppet:///modules/site_apache/service/CentOS/httpd", - "puppet:///modules/apache/service/CentOS/httpd" ], + path => '/etc/sysconfig/httpd', + source => [ "puppet:///modules/site_apache/service/CentOS/${::fqdn}/httpd", + 'puppet:///modules/site_apache/service/CentOS/httpd', + 'puppet:///modules/apache/service/CentOS/httpd' ], require => Package['apache'], - notify => Service['apache'], - owner => root, group => 0, mode => 0644; + notify => Service['apache'], + owner => root, + group => 0, + mode => '0644'; } # this is for later fixes exec{ 'adjust_pidfile': command => 'sed -i "s/^#PidFile \(.*\)/PidFile \1/g" /etc/httpd/conf/httpd.conf', - unless => "grep -qE '^PidFile ' /etc/httpd/conf/httpd.conf", + unless => 'grep -qE \'^PidFile \' /etc/httpd/conf/httpd.conf', require => Package['apache'], - notify => Service['apache']; + notify => Service['apache']; 'adjust_listen': command => 'sed -i "s/^#Listen 80/Listen 80/g" /etc/httpd/conf/httpd.conf', - unless => "grep -qE '^Listen 80' /etc/httpd/conf/httpd.conf", + unless => 'grep -qE \'^Listen 80\' /etc/httpd/conf/httpd.conf', require => Package['apache'], - notify => Service['apache']; + notify => Service['apache']; } apache::config::global{'00-listen.conf': |