diff options
| -rw-r--r-- | manifests/centos.pp | 14 | ||||
| -rw-r--r-- | manifests/htpasswd_user.pp | 4 | ||||
| -rw-r--r-- | manifests/openbsd.pp | 4 | ||||
| -rw-r--r-- | manifests/ssl/openbsd.pp | 6 |
4 files changed, 16 insertions, 12 deletions
diff --git a/manifests/centos.pp b/manifests/centos.pp index e8a413d..b3af7f6 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -38,13 +38,17 @@ class apache::centos inherits apache::package { owner => root, group => 0, mode => 0644; } - line{ + file_line{ 'pidfile_httpd.conf': - file => '/etc/httpd/conf/httpd.conf', - line => 'PidFile run/httpd.pid'; + path => '/etc/httpd/conf/httpd.conf', + line => 'PidFile run/httpd.pid', + require => Package['apache'], + notify=> Package['apache']; 'listen_httpd.conf': - file => '/etc/httpd/conf/httpd.conf', - line => 'Listen 80'; + path => '/etc/httpd/conf/httpd.conf', + line => 'Listen 80', + require => Package['apache'], + notify=> Package['apache']; } apache::config::global{'00-listen.conf': ensure => absent, diff --git a/manifests/htpasswd_user.pp b/manifests/htpasswd_user.pp index 5a7c413..9fcea0a 100644 --- a/manifests/htpasswd_user.pp +++ b/manifests/htpasswd_user.pp @@ -26,9 +26,9 @@ define apache::htpasswd_user( $real_password = htpasswd_sha1($password) } - line{"htpasswd_for_${real_site}": + file_line{"htpasswd_for_${real_site}": ensure => $ensure, - file => $real_path, + path => $real_path, line => "${username}:${real_password}", } } diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp index 68a13b1..f1c8ac0 100644 --- a/manifests/openbsd.pp +++ b/manifests/openbsd.pp @@ -20,8 +20,8 @@ class apache::openbsd inherits apache::base { File[web_dir]{ group => daemon, } - line{'enable_apache_on_boot': - file => '/etc/rc.conf.local', + file_line{'enable_apache_on_boot': + path => '/etc/rc.conf.local', line => 'httpd flags=""', } file{'apache_main_config': diff --git a/manifests/ssl/openbsd.pp b/manifests/ssl/openbsd.pp index 0e221aa..43bc680 100644 --- a/manifests/ssl/openbsd.pp +++ b/manifests/ssl/openbsd.pp @@ -1,11 +1,11 @@ class apache::ssl::openbsd inherits apache::openbsd { include apache::ssl::base - Line['enable_apache_on_boot']{ + File_line['enable_apache_on_boot']{ ensure => 'absent', } - line{'enable_apachessl_on_boot': - file => '/etc/rc.conf.local', + file_line{'enable_apachessl_on_boot': + path => '/etc/rc.conf.local', line => 'httpd flags="-DSSL"', } |