diff options
| -rw-r--r-- | files/conf/OpenBSD/httpd.conf | 4 | ||||
| -rw-r--r-- | manifests/init.pp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/files/conf/OpenBSD/httpd.conf b/files/conf/OpenBSD/httpd.conf index 516948b..09e452e 100644 --- a/files/conf/OpenBSD/httpd.conf +++ b/files/conf/OpenBSD/httpd.conf @@ -1116,5 +1116,5 @@ CustomLog logs/ssl_request_log \ </IfDefine> # include additional things -Include conf/conf.d/*.conf -Include conf/vhosts.d/*.conf +Include conf.d/*.conf +Include vhosts.d/*.conf diff --git a/manifests/init.pp b/manifests/init.pp index b66be3d..17a63cc 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -167,7 +167,7 @@ class apache::ubuntu inherits apache::debian {} ### openbsd class apache::openbsd inherits apache::base { - $config_dir = '/var/www/conf/' + $config_dir = '/var/www/' File[vhosts_dir]{ path => "$config_dir/vhosts.d/", @@ -184,7 +184,7 @@ class apache::openbsd inherits apache::base { line => 'httpd flags=""', } - file{"/var/www/conf/httpd.conf": + file{"$config_dir/conf/httpd.conf": source => [ "puppet://$server/files/apache/conf/${fqdn}/httpd.conf", "puppet://$server/files/apache/conf/${apache_cluster_node}/httpd.conf", "puppet://$server/files/apache/conf/httpd.conf", |