diff --git a/manifests/confd/no_accf.pp b/manifests/confd/no_accf.pp index 024a088a96..d4436e3b53 100644 --- a/manifests/confd/no_accf.pp +++ b/manifests/confd/no_accf.pp @@ -7,7 +7,7 @@ file { 'no-accf.conf': ensure => 'file', path => "${apache::confd_dir}/no-accf.conf", - content => template('apache/confd/no-accf.conf.erb'), + content => epp('apache/confd/no-accf.conf.epp'), require => Exec["mkdir ${apache::confd_dir}"], before => File[$apache::confd_dir], } diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp index df7e5ce004..7f7900b328 100644 --- a/manifests/fastcgi/server.pp +++ b/manifests/fastcgi/server.pp @@ -48,13 +48,24 @@ $socket = $host } + $parameters = { + 'timeout' => $timeout, + 'flush' => $flush, + 'socket' => $socket, + 'host' => $host, + 'pass_header' => $pass_header, + 'faux_path' => $faux_path, + 'fcgi_alias' => $fcgi_alias, + 'file_type' => $file_type, + } + file { "fastcgi-pool-${name}.conf": ensure => file, path => "${apache::confd_dir}/fastcgi-pool-${name}.conf", owner => 'root', group => $apache::params::root_group, mode => $apache::file_mode, - content => template('apache/fastcgi/server.erb'), + content => epp('apache/fastcgi/server.epp', $parameters), require => Exec["mkdir ${apache::confd_dir}"], before => File[$apache::confd_dir], notify => Class['apache::service'], diff --git a/manifests/init.pp b/manifests/init.pp index 582b4ddac9..55ef9954e0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -727,7 +727,7 @@ } concat::fragment { 'Apache ports header': target => $ports_file, - content => template('apache/ports_header.erb'), + content => epp('apache/ports_header.epp'), } if $apache::conf_dir and $apache::params::conf_file { @@ -782,10 +782,57 @@ # - $server_signature # - $trace_enable # - $root_directory_secured + $parameters = { + 'server_tokens' => $server_tokens, + 'server_signature' => $server_signature, + 'trace_enable' => $trace_enable, + 'servername' => $servername, + 'server_root' => $server_root, + 'serveradmin' => $serveradmin, + 'pidfile' => $pidfile, + 'timeout' => $timeout, + 'keepalive' => $keepalive, + 'max_keepalive_requests' => $max_keepalive_requests, + 'keepalive_timeout' => $keepalive_timeout, + 'limitreqfieldsize' => $limitreqfieldsize, + 'limitreqfields' => $limitreqfields, + 'limitreqline' => $limitreqline, + 'http_protocol_options' => $http_protocol_options, + 'protocols' => $protocols, + 'protocols_honor_order' => $protocols_honor_order, + 'user' => $user, + 'group' => $group, + 'root_directory_options' => $root_directory_options, + 'root_directory_secured' => $root_directory_secured, + 'default_charset' => $default_charset, + 'hostname_lookups' => $hostname_lookups, + 'error_log' => $error_log, + 'logroot' => $logroot, + 'log_level' => $log_level, + 'sendfile' => $sendfile, + 'allow_encoded_slashes' => $allow_encoded_slashes, + 'file_e_tag' => $file_e_tag, + 'use_canonical_name' => $use_canonical_name, + 'apxs_workaround' => $apxs_workaround, + 'mod_load_dir' => $mod_load_dir, + 'confd_dir' => $confd_dir, + 'vhost_load_dir' => $vhost_load_dir, + 'vhost_include_pattern' => $vhost_include_pattern, + 'ports_file' => $ports_file, + 'log_formats' => $log_formats, + 'conf_enabled' => $conf_enabled, + 'ldap_verify_server_cert' => $ldap_verify_server_cert, + 'ldap_trusted_mode' => $ldap_trusted_mode, + 'error_documents' => $error_documents, + 'error_documents_path' => $error_documents_path, + } + + notice $conf_template + file { "${apache::conf_dir}/${apache::params::conf_file}": ensure => file, mode => $apache::file_mode, - content => template($conf_template), + content => epp($conf_template, $parameters), notify => Class['Apache::Service'], require => [Package['httpd'], Concat[$ports_file]], } diff --git a/manifests/listen.pp b/manifests/listen.pp index 3eb60baad8..ad9844a09d 100644 --- a/manifests/listen.pp +++ b/manifests/listen.pp @@ -10,6 +10,6 @@ # Template uses: $listen_addr_port concat::fragment { "Listen ${listen_addr_port}": target => $apache::ports_file, - content => template('apache/listen.erb'), + content => epp('apache/listen.epp', { 'listen_addr_port' => $listen_addr_port }), } } diff --git a/manifests/namevirtualhost.pp b/manifests/namevirtualhost.pp index 246df53dd8..b2a3d22a67 100644 --- a/manifests/namevirtualhost.pp +++ b/manifests/namevirtualhost.pp @@ -10,6 +10,6 @@ # Template uses: $addr_port concat::fragment { "NameVirtualHost ${addr_port}": target => $apache::ports_file, - content => template('apache/namevirtualhost.erb'), + content => epp('apache/namevirtualhost.epp', { 'addr_port' => $addr_port }), } } diff --git a/manifests/params.pp b/manifests/params.pp index fbdeb0401e..e3c5b14466 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -95,7 +95,7 @@ $mod_libs = { 'nss' => 'libmodnss.so', } - $conf_template = 'apache/httpd.conf.erb' + $conf_template = 'apache/httpd.conf.epp' $http_protocol_options = undef $keepalive = 'On' $keepalive_timeout = 15 @@ -231,7 +231,7 @@ default => 'mod_wsgi_python3.so', }, } - $conf_template = 'apache/httpd.conf.erb' + $conf_template = 'apache/httpd.conf.epp' $http_protocol_options = undef $keepalive = 'On' $keepalive_timeout = 15 @@ -383,7 +383,7 @@ $mod_libs = { 'shib2' => $shib2_lib, } - $conf_template = 'apache/httpd.conf.erb' + $conf_template = 'apache/httpd.conf.epp' $http_protocol_options = undef $keepalive = 'On' $keepalive_timeout = 15 @@ -492,7 +492,7 @@ } $mod_libs = { } - $conf_template = 'apache/httpd.conf.erb' + $conf_template = 'apache/httpd.conf.epp' $http_protocol_options = undef $keepalive = 'On' $keepalive_timeout = 15 @@ -558,7 +558,7 @@ } $mod_libs = { } - $conf_template = 'apache/httpd.conf.erb' + $conf_template = 'apache/httpd.conf.epp' $http_protocol_options = undef $keepalive = 'On' $keepalive_timeout = 15 @@ -633,7 +633,7 @@ 'security' => '/usr/lib64/apache2/mod_security2.so', 'php53' => '/usr/lib64/apache2/mod_php5.so', } - $conf_template = 'apache/httpd.conf.erb' + $conf_template = 'apache/httpd.conf.epp' $http_protocol_options = undef $keepalive = 'On' $keepalive_timeout = 15 diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md index 22fbebcc14..c4731bf1c6 100644 --- a/readmes/README_ja_JP.md +++ b/readmes/README_ja_JP.md @@ -883,7 +883,7 @@ Apacheサーバのメイン設定ファイルを置くディレクトリを設 メインのApache設定ファイルで使用される[テンプレート][]を定義します。apacheモジュールは、`conf.d`エントリによりカスタマイズされた最小限の設定ファイルを使用するように設計されているため、このパラメータの変更には潜在的なリスクが伴います。 -デフォルト値: `apache/httpd.conf.erb`。 +デフォルト値: `apache/httpd.conf.epp`。 ##### `confd_dir` diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb index 2e57b32388..27a8d1681e 100644 --- a/spec/acceptance/apache_parameters_spec.rb +++ b/spec/acceptance/apache_parameters_spec.rb @@ -11,7 +11,7 @@ end if os[:family] == 'freebsd' - describe file("#{apache_hash['confd_dir']}/no-accf.conf.erb") do + describe file("#{apache_hash['confd_dir']}/no-accf.conf.epp") do it { is_expected.not_to be_file } end end @@ -24,7 +24,7 @@ end if os[:family] == 'freebsd' - describe file("#{apache_hash['confd_dir']}/no-accf.conf.erb") do + describe file("#{apache_hash['confd_dir']}/no-accf.conf.epp") do it { is_expected.to be_file } end end @@ -310,9 +310,9 @@ class { 'apache': httpd_dir => '/tmp', service_ensure => stopped } describe 'conf_template' do describe 'setup' do it 'applies cleanly' do - pp = "class { 'apache': conf_template => 'another/test.conf.erb', service_ensure => stopped }" + pp = "class { 'apache': conf_template => 'another/test.conf.epp', service_ensure => stopped }" run_shell('mkdir -p /etc/puppetlabs/code/environments/production/modules/another/templates') - run_shell("echo 'testcontent' >> /etc/puppetlabs/code/environments/production/modules/another/templates/test.conf.erb") + run_shell("echo 'testcontent' >> /etc/puppetlabs/code/environments/production/modules/another/templates/test.conf.epp") apply_manifest(pp, catch_failures: true) end end diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb index 336f980c92..f7ff3b7581 100644 --- a/spec/classes/apache_spec.rb +++ b/spec/classes/apache_spec.rb @@ -433,7 +433,7 @@ describe 'different templates for httpd.conf with default' do let :params do - { conf_template: 'apache/httpd.conf.erb' } + { conf_template: 'apache/httpd.conf.epp' } end it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^# Security\n} } @@ -441,7 +441,7 @@ describe 'different templates for httpd.conf with non-default' do let :params do - { conf_template: 'site_apache/fake.conf.erb' } + { conf_template: 'site_apache/fake.conf.epp' } end it { is_expected.to contain_file('/etc/httpd/conf/httpd.conf').with_content %r{^Fake template for rspec.$} } diff --git a/spec/fixtures/site_apache/templates/fake.conf.erb b/spec/fixtures/site_apache/templates/fake.conf.epp similarity index 100% rename from spec/fixtures/site_apache/templates/fake.conf.erb rename to spec/fixtures/site_apache/templates/fake.conf.epp diff --git a/templates/confd/no-accf.conf.erb b/templates/confd/no-accf.conf.epp similarity index 100% rename from templates/confd/no-accf.conf.erb rename to templates/confd/no-accf.conf.epp diff --git a/templates/fastcgi/server.epp b/templates/fastcgi/server.epp new file mode 100644 index 0000000000..50bd052a2f --- /dev/null +++ b/templates/fastcgi/server.epp @@ -0,0 +1,24 @@ +<% + $timeout_updated = " -idle-timeout #{$timeout}" + + if $flush { + $flush_updated = " -flush" + } else { + $flush_updated = "" + } + if $socket { + $host_or_socket = " -socket #{$socket}" + } else { + $host_or_socket = " -host #{$host}" + } + if $pass_header and !$pass_header.empty { + $pass_header_updated = " -pass-header #{$pass_header}" + } else { + $pass_header_updated = "" + } + + $options = $timeout_updated + $flush_updated + $host_or_socket + $pass_header_updated +-%> +FastCGIExternalServer <%= $faux_path %><%= $options %> +Alias <%= $fcgi_alias %> <%= $faux_path %> +Action <%= $file_type %> <%= $fcgi_alias %> diff --git a/templates/httpd.conf.epp b/templates/httpd.conf.epp new file mode 100644 index 0000000000..53d7e8ab2c --- /dev/null +++ b/templates/httpd.conf.epp @@ -0,0 +1,151 @@ +# Security +ServerTokens <%= $server_tokens %> +ServerSignature <%= apache::bool2httpd($server_signature) %> +TraceEnable <%= apache::bool2httpd($trace_enable) %> + +ServerName "<%= $servername %>" +ServerRoot "<%= $server_root %>" +<%- if $serveradmin { -%> +ServerAdmin <%= $serveradmin %> +<%- } -%> +PidFile <%= $pidfile %> +Timeout <%= $timeout %> +KeepAlive <%= $keepalive %> +MaxKeepAliveRequests <%= $max_keepalive_requests %> +KeepAliveTimeout <%= $keepalive_timeout %> +LimitRequestFieldSize <%= $limitreqfieldsize %> +LimitRequestFields <%= $limitreqfields %> +<% if $limitreqline { -%> +LimitRequestLine <%= $limitreqline %> +<% } -%> +<%- if $http_protocol_options { -%> +HttpProtocolOptions <%= $http_protocol_options %> +<%- } -%> + +<%- unless $protocols.empty { -%> +Protocols <%= $protocols.join(' ') %> +<%- } -%> +<%- if $protocols_honor_order { -%> +ProtocolsHonorOrder <%= apache::bool2httpd($protocols_honor_order) %> +<%- } -%> + +User <%= $user %> +Group <%= $group %> + +AccessFileName .htaccess + + Require all denied + + + + Options <%= Array($root_directory_options).join(' ') %> + AllowOverride None +<%- if $root_directory_secured { -%> + Require all denied +<%- } -%> + + +<% if $default_charset { -%> +AddDefaultCharset <%= $default_charset %> +<% } -%> + +HostnameLookups <%= $hostname_lookups %> +<%- if $error_log.match(/^[|\/]/) or $error_log.match(/^syslog:/) { -%> +ErrorLog "<%= $error_log %>" +<%- }else { -%> +ErrorLog "<%= $logroot %>/<%= $error_log %>" +<% } -%> +LogLevel <%= $log_level %> +EnableSendfile <%= $sendfile %> +<%- if $allow_encoded_slashes { -%> +AllowEncodedSlashes <%= $allow_encoded_slashes %> +<%- } -%> +<%- if $file_e_tag { -%> +FileETag <%= $file_e_tag %> +<%- } -%> +<%- if $use_canonical_name { -%> +UseCanonicalName <%= $use_canonical_name %> +<%- } -%> + +#Listen 80 + +<% if $apxs_workaround { -%> +# Workaround: without this hack apxs would be confused about where to put +# LoadModule directives and fail entire procedure of apache package +# installation/reinstallation. This problem was observed on FreeBSD (apache22). +#LoadModule fake_module libexec/apache22/mod_fake.so +<% } -%> + +Include "<%= $mod_load_dir %>/*.load" +<% if $mod_load_dir != $confd_dir and $mod_load_dir != $vhost_load_dir { -%> +Include "<%= $mod_load_dir %>/*.conf" +<% } -%> +Include "<%= $ports_file %>" + +<% unless $log_formats['combined'] { -%> +LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +<% } -%> +<% unless $log_formats['common'] { -%> +LogFormat "%a %l %u %t \"%r\" %>s %b" common +<% } -%> +<% unless $log_formats['referer'] { -%> +LogFormat "%{Referer}i -> %U" referer +<% } -%> +<% unless $log_formats['agent'] { -%> +LogFormat "%{User-agent}i" agent +<% } -%> +<% unless $log_formats['forwarded'] { -%> +LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded +<% } -%> +<% if $log_formats and !$log_formats.empty { -%> + <%- $log_formats.convert_to(Array).sort.each |$values| { -%> +LogFormat "<%= $values[1] -%>" <%= $values[0] %> + <%- } -%> +<% } -%> + +<%- if $conf_enabled { -%> +IncludeOptional "<%= $conf_enabled %>/*.conf" +<%- } -%> +IncludeOptional "<%= $confd_dir %>/*.conf" +<% if $vhost_load_dir != $confd_dir { -%> +IncludeOptional "<%= $vhost_load_dir %>/<%= $vhost_include_pattern %>" +<% } -%> +<% if $ldap_verify_server_cert { -%> +LDAPVerifyServerCert <%= $ldap_verify_server_cert %> +<% } -%> +<% if $ldap_trusted_mode { -%> +LDAPTrustedMode <%= $ldap_trusted_mode %> +<% } -%> + +<% if $error_documents { -%> +# /usr/share/apache2/error on debian +Alias /error/ "<%=$error_documents_path %>/" + +"> + AllowOverride None + Options IncludesNoExec + AddOutputFilter Includes html + AddHandler type-map var + Require all granted + LanguagePriority en cs de es fr it nl sv pt-br ro + ForceLanguagePriority Prefer Fallback + + +ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var +ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var +ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var +ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var +ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var +ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var +ErrorDocument 410 /error/HTTP_GONE.html.var +ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var +ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var +ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var +ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var +ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var +ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var +ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var +ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var +ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var +ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var +<% } -%> diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb deleted file mode 100644 index 4a26d41a73..0000000000 --- a/templates/httpd.conf.erb +++ /dev/null @@ -1,151 +0,0 @@ -# Security -ServerTokens <%= @server_tokens %> -ServerSignature <%= scope.call_function('apache::bool2httpd', [@server_signature]) %> -TraceEnable <%= scope.call_function('apache::bool2httpd', [@trace_enable]) %> - -ServerName "<%= @servername %>" -ServerRoot "<%= @server_root %>" -<%- if @serveradmin -%> -ServerAdmin <%= @serveradmin %> -<%- end -%> -PidFile <%= @pidfile %> -Timeout <%= @timeout %> -KeepAlive <%= @keepalive %> -MaxKeepAliveRequests <%= @max_keepalive_requests %> -KeepAliveTimeout <%= @keepalive_timeout %> -LimitRequestFieldSize <%= @limitreqfieldsize %> -LimitRequestFields <%= @limitreqfields %> -<% if @limitreqline -%> -LimitRequestLine <%= @limitreqline %> -<% end -%> -<%- if @http_protocol_options -%> -HttpProtocolOptions <%= @http_protocol_options %> -<%- end -%> - -<%- unless @protocols.empty? -%> -Protocols <%= @protocols.join(' ') %> -<%- end -%> -<%- unless @protocols_honor_order.nil? -%> -ProtocolsHonorOrder <%= scope.call_function('apache::bool2httpd', [@protocols_honor_order]) %> -<%- end -%> - -User <%= @user %> -Group <%= @group %> - -AccessFileName .htaccess - - Require all denied - - - - Options <%= Array(@root_directory_options).join(' ') %> - AllowOverride None -<%- if @root_directory_secured -%> - Require all denied -<%- end -%> - - -<% if @default_charset -%> -AddDefaultCharset <%= @default_charset %> -<% end -%> - -HostnameLookups <%= @hostname_lookups %> -<%- if /^[|\/]/.match(@error_log) || /^syslog:/.match(@error_log) -%> -ErrorLog "<%= @error_log %>" -<%- else -%> -ErrorLog "<%= @logroot %>/<%= @error_log %>" -<%- end -%> -LogLevel <%= @log_level %> -EnableSendfile <%= @sendfile %> -<%- if @allow_encoded_slashes -%> -AllowEncodedSlashes <%= @allow_encoded_slashes %> -<%- end -%> -<%- if @file_e_tag -%> -FileETag <%= @file_e_tag %> -<%- end -%> -<%- if @use_canonical_name -%> -UseCanonicalName <%= @use_canonical_name %> -<%- end -%> - -#Listen 80 - -<% if @apxs_workaround -%> -# Workaround: without this hack apxs would be confused about where to put -# LoadModule directives and fail entire procedure of apache package -# installation/reinstallation. This problem was observed on FreeBSD (apache22). -#LoadModule fake_module libexec/apache22/mod_fake.so -<% end -%> - -Include "<%= @mod_load_dir %>/*.load" -<% if @mod_load_dir != @confd_dir and @mod_load_dir != @vhost_load_dir -%> -Include "<%= @mod_load_dir %>/*.conf" -<% end -%> -Include "<%= @ports_file %>" - -<% unless @log_formats.has_key?('combined') -%> -LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined -<% end -%> -<% unless @log_formats.has_key?('common') -%> -LogFormat "%a %l %u %t \"%r\" %>s %b" common -<% end -%> -<% unless @log_formats.has_key?('referer') -%> -LogFormat "%{Referer}i -> %U" referer -<% end -%> -<% unless @log_formats.has_key?('agent') -%> -LogFormat "%{User-agent}i" agent -<% end -%> -<% unless @log_formats.has_key?('forwarded') -%> -LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded -<% end -%> -<% if @log_formats and !@log_formats.empty? -%> - <%- @log_formats.sort.each do |nickname,format| -%> -LogFormat "<%= format -%>" <%= nickname %> - <%- end -%> -<% end -%> - -<%- if @conf_enabled -%> -IncludeOptional "<%= @conf_enabled %>/*.conf" -<%- end -%> -IncludeOptional "<%= @confd_dir %>/*.conf" -<% if @vhost_load_dir != @confd_dir -%> -IncludeOptional "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>" -<% end -%> -<% if @ldap_verify_server_cert -%> -LDAPVerifyServerCert <%= @ldap_verify_server_cert %> -<% end -%> -<% if @ldap_trusted_mode -%> -LDAPTrustedMode <%= @ldap_trusted_mode %> -<% end -%> - -<% if @error_documents -%> -# /usr/share/apache2/error on debian -Alias /error/ "<%= @error_documents_path %>/" - -"> - AllowOverride None - Options IncludesNoExec - AddOutputFilter Includes html - AddHandler type-map var - Require all granted - LanguagePriority en cs de es fr it nl sv pt-br ro - ForceLanguagePriority Prefer Fallback - - -ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var -ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var -ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var -ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var -ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var -ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var -ErrorDocument 410 /error/HTTP_GONE.html.var -ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var -ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var -ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var -ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var -ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var -ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var -ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var -ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var -ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var -ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var -<% end -%> diff --git a/templates/listen.erb b/templates/listen.epp similarity index 73% rename from templates/listen.erb rename to templates/listen.epp index 8fc871b0ad..5b9035ae7e 100644 --- a/templates/listen.erb +++ b/templates/listen.epp @@ -3,4 +3,4 @@ - : - [ -%> -Listen <%= @listen_addr_port %> +Listen <%= $listen_addr_port %> diff --git a/templates/namevirtualhost.erb b/templates/namevirtualhost.epp similarity index 77% rename from templates/namevirtualhost.erb rename to templates/namevirtualhost.epp index cf767680fc..2cd7631ee0 100644 --- a/templates/namevirtualhost.erb +++ b/templates/namevirtualhost.epp @@ -5,4 +5,4 @@ - - : -%> -NameVirtualHost <%= @addr_port %> +NameVirtualHost <%= $addr_port %> diff --git a/templates/ports_header.erb b/templates/ports_header.epp similarity index 100% rename from templates/ports_header.erb rename to templates/ports_header.epp