diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-17 16:07:55 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-17 16:07:55 -0400 |
| commit | 6844258b567b5065f5488a12f3f18208ff36ecb0 (patch) | |
| tree | 57dc2fd942ca81584f85ea7f25ec77a6b845f88e /manifests/ssl/openbsd.pp | |
| parent | dafb060fc57957dbe9e5e90698537e781cebeaf6 (diff) | |
| parent | 2f6d7891e115f921c157567e2aa5afd6199c310e (diff) | |
Merge remote-tracking branch 'shared/master' into leap
Conflicts:
manifests/debian.pp
Diffstat (limited to 'manifests/ssl/openbsd.pp')
| -rw-r--r-- | manifests/ssl/openbsd.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/ssl/openbsd.pp b/manifests/ssl/openbsd.pp index 6d357ee..43bc680 100644 --- a/manifests/ssl/openbsd.pp +++ b/manifests/ssl/openbsd.pp @@ -1,16 +1,16 @@ 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"', } File['/opt/bin/restart_apache.sh']{ - source => "puppet://$server/modules/apache/scripts/OpenBSD/bin/restart_apache_ssl.sh", + source => "puppet:///modules/apache/scripts/OpenBSD/bin/restart_apache_ssl.sh", } Service['apache']{ start => 'apachectl startssl', |