diff options
| author | Michael Scherer <misc@mageia.org> | 2012-03-25 13:17:26 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-03-25 13:17:26 +0000 |
| commit | 45cbc0000bbebd81c9946fbcc04371d85b0ca8fe (patch) | |
| tree | ec37c21a40aa3d31956529280d17f4034945b0c4 | |
| parent | 4d457240847480821a4e86eac09fed7c5983b262 (diff) | |
| download | puppet-45cbc0000bbebd81c9946fbcc04371d85b0ca8fe.tar puppet-45cbc0000bbebd81c9946fbcc04371d85b0ca8fe.tar.gz puppet-45cbc0000bbebd81c9946fbcc04371d85b0ca8fe.tar.bz2 puppet-45cbc0000bbebd81c9946fbcc04371d85b0ca8fe.tar.xz puppet-45cbc0000bbebd81c9946fbcc04371d85b0ca8fe.zip | |
fix syntax, and properly indent the file
| -rw-r--r-- | modules/apache/manifests/vhost/base.pp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/modules/apache/manifests/vhost/base.pp b/modules/apache/manifests/vhost/base.pp index c4bd1f91..a7e5720d 100644 --- a/modules/apache/manifests/vhost/base.pp +++ b/modules/apache/manifests/vhost/base.pp @@ -8,43 +8,43 @@ define apache::vhost::base ($content = '', $error_logfile = false, $options = [], $enable_public_html = false) { - include apache::base - $httpd_logdir = '/var/log/httpd' - $filename = "$name.conf" + include apache::base + $httpd_logdir = '/var/log/httpd' + $filename = "$name.conf" - if ! $vhost { - $real_vhost = $name - } else { - $real_vhost = $vhost - } + if ! $vhost { + $real_vhost = $name + } else { + $real_vhost = $vhost + } - if ! $access_logfile { - $real_access_logfile = "$httpd_logdir/${real_vhost}-access_log" - } else { - $real_access_logfile = $access_logfile - } - if ! $error_logfile { - $real_error_logfile = "$httpd_logdir/${real_vhost}-error_log" - } else { - $real_error_logfile = $error_logfile - } + if ! $access_logfile { + $real_access_logfile = "$httpd_logdir/${real_vhost}-access_log" + } else { + $real_access_logfile = $access_logfile + } + if ! $error_logfile { + $real_error_logfile = "$httpd_logdir/${real_vhost}-error_log" + } else { + $real_error_logfile = $error_logfile + } - if $use_ssl { - include apache::mod::ssl - if $wildcard_sslcert != true { - openssl::self_signed_cert{ $real_vhost: - directory => '/etc/ssl/apache/', - before => Apache::Config["/etc/httpd/conf/vhosts.d/$filename"], - } + if $use_ssl { + include apache::mod::ssl + if $wildcard_sslcert != true { + openssl::self_signed_cert{ $real_vhost: + directory => '/etc/ssl/apache/', + before => Apache::Config["/etc/httpd/conf/vhosts.d/$filename"], } } + } - if $enable_public_html { - include apache::mod::public_html - } + if $enable_public_html { + include apache::mod::public_html + } - apache::config { "/etc/httpd/conf/vhosts.d/$filename": - content => template('apache/vhost_base.conf') - } + apache::config { "/etc/httpd/conf/vhosts.d/$filename": + content => template('apache/vhost_base.conf') } } + |