diff options
| author | mh <mh@immerda.ch> | 2011-11-23 00:14:30 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-11-23 00:14:30 +0100 |
| commit | 433a3eb900a092fe514bbb60a8cb0d2f49d4a473 (patch) | |
| tree | 389b6efaa1b777d03d28985148a1960ae777cb42 | |
| parent | d186ff759ee7e122a7767ce7e8c50f86cd6a2c9e (diff) | |
there is another Listen example already commented out
| -rw-r--r-- | manifests/centos.pp | 4 | ||||
| -rw-r--r-- | manifests/centos/itk_plus.pp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/manifests/centos.pp b/manifests/centos.pp index 95d06ce..6bb9ed8 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -46,8 +46,8 @@ class apache::centos inherits apache::package { require => Package['apache'], notify => Service['apache']; 'adjust_listen': - command => 'sed -i "s/^#Listen \(.*\)/Listen \1/g" /etc/httpd/conf/httpd.conf', - unless => "grep -qE '^Listen ' /etc/httpd/conf/httpd.conf", + command => 'sed -i "s/^#Listen 80/Listen 80/g" /etc/httpd/conf/httpd.conf', + unless => "grep -qE '^Listen 80' /etc/httpd/conf/httpd.conf", require => Package['apache'], notify => Service['apache']; } diff --git a/manifests/centos/itk_plus.pp b/manifests/centos/itk_plus.pp index 9bcd8ca..bab2409 100644 --- a/manifests/centos/itk_plus.pp +++ b/manifests/centos/itk_plus.pp @@ -5,8 +5,8 @@ class apache::centos::itk_plus inherits apache::centos::itk { unless => "grep -qE '^#PidFile ' /etc/httpd/conf/httpd.conf", } Exec['adjust_listen']{ - command => "sed -i 's/^Listen \(.*\)/#Listen \1/g' /etc/httpd/conf/httpd.conf", - unless => "grep -qE '^#Listen ' /etc/httpd/conf/httpd.conf", + command => "sed -i 's/^Listen 80/#Listen 80/g' /etc/httpd/conf/httpd.conf", + unless => "grep -qE '^#Listen 80' /etc/httpd/conf/httpd.conf", } Apache::Config::Global['00-listen.conf']{ |