Skip to content

Commit 6dcf415

Browse files
Dinesh GujarDinesh Gujar
Dinesh Gujar
authored and
Dinesh Gujar
committed
CAT-1347 spacing fix reverted
This reverts commit 84cbf73.
1 parent df1825f commit 6dcf415

30 files changed

+314
-293
lines changed

‎templates/vhost/_action.epp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%- if $action { -%>
1+
<% if $action {-%>
22

33
Action <%= $action %> /cgi-bin virtual
4-
<%- } -%>
4+
<% } -%>

‎templates/vhost/_aliases.epp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
## Alias declarations for resources outside the DocumentRoot
2-
<%- $aliases.each |$alias_statement| { -%>
3-
<%- if $alias_statement["path"] { -%>
4-
<%- if $alias_statement["alias"] { -%>
2+
<%- $aliases.each |$alias_statement| {-%>
3+
<%- if $alias_statement["path"] {-%>
4+
<%- if $alias_statement["alias"] {-%>
55
Alias <%= $alias_statement["alias"] %> "<%= $alias_statement["path"] %>"
6-
<%- }elsif $alias_statement["aliasmatch"] { -%>
6+
<%-}elsif $alias_statement["aliasmatch"] {-%>
77
AliasMatch <%= $alias_statement["aliasmatch"] %> "<%= $alias_statement["path"] %>"
8-
<%- } elsif $alias_statement["scriptalias"] { -%>
8+
<%-} elsif $alias_statement["scriptalias"] {-%>
99
ScriptAlias <%= $alias_statement["scriptalias"] %> "<%= $alias_statement["path"] %>"
10-
<%- } elsif $alias_statement["scriptaliasmatch"] { -%>
10+
<%-} elsif $alias_statement["scriptaliasmatch"] {-%>
1111
ScriptAliasMatch <%= $alias_statement["scriptaliasmatch"] %> "<%= $alias_statement["path"] %>"
1212
<%- } -%>
1313
<%- } -%>

‎templates/vhost/_allow_encoded_slashes.epp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%- if $allow_encoded_slashes { -%>
1+
<%- if $allow_encoded_slashes {-%>
22

33
AllowEncodedSlashes <%= $allow_encoded_slashes %>
44
<%- } -%>

‎templates/vhost/_auth_cas.epp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%- if $cas_enabled { -%>
1+
<% if $cas_enabled { -%>
22
<%- if $cas_cookie_path { -%>
33
CASCookiePath <%= $cas_cookie_path %>
44
<%- } -%>

‎templates/vhost/_auth_kerb.epp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%- if $auth_kerb { -%>
1+
<% if $auth_kerb { -%>
22

33
## Kerberos directives
44
<%- if $krb_method_negotiate { -%>
@@ -29,4 +29,4 @@
2929
KrbSaveCredentials <%= $krb_save_credentials -%>
3030
<%- } -%>
3131

32-
<%- } -%>
32+
<% } -%>

‎templates/vhost/_auth_oidc.epp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<%- if $auth_oidc { -%>
2-
<%- $oidc_settings.map |Any $key, Any $value| { -%>
1+
<% if $auth_oidc { -%>
2+
<% $oidc_settings.map |Any $key, Any $value| { %>
33
OIDC<%= $key %> <% if $key == 'Scope' { -%>"<%= $value -%>"<% } else { -%><%= $value -%><% }-%>
4-
<%- } -%>
5-
<%- } -%>
4+
<% } %>
5+
<% } -%>

‎templates/vhost/_authz_core.epp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<%- $authz_core_config.each |$line| { -%>
1+
<% $authz_core_config.each |$line| { -%>
22
<%= $line %>
33
<%- } -%>

‎templates/vhost/_charsets.epp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%- if $add_default_charset { -%>
1+
<% if $add_default_charset {-%>
22

33
AddDefaultCharset <%= $add_default_charset %>
4-
<%- } -%>
4+
<% } -%>

‎templates/vhost/_custom_fragment.epp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<%- if $custom_fragment { -%>
1+
<% if $custom_fragment {-%>
22

33
## Custom fragment
44
<%= $custom_fragment %>
5-
<%- } -%>
5+
<% } -%>

‎templates/vhost/_docroot.epp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
## Vhost docroot
3-
<%- if $virtual_docroot { -%>
3+
<% if $virtual_docroot {-%>
44
VirtualDocumentRoot "<%= $virtual_docroot %>"
5-
<%- } -%>
6-
<%- if $docroot and ((!$virtual_docroot) or $virtual_use_default_docroot) { -%>
5+
<% } -%>
6+
<% if $docroot and ((! $virtual_docroot) or $virtual_use_default_docroot) {-%>
77
DocumentRoot "<%= $docroot %>"
8-
<%- } -%>
8+
<% } -%>

‎templates/vhost/_fallbackresource.epp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%- if $fallbackresource { -%>
1+
<% if $fallbackresource {-%>
22

33
FallbackResource <%= $fallbackresource %>
4-
<%- } -%>
4+
<% } -%>

‎templates/vhost/_file_footer.epp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<%- $define.each | $k, $v| { -%>
1+
<% $define.each | $k, $v| {-%>
22
Undefine <%= $k %>
3-
<%- } -%>
3+
<% } -%>
44
</VirtualHost>
5-
<%- if $passenger_pre_start { -%>
6-
<%- [$passenger_pre_start].flatten().filter |$value| { $value }.each |$each_passenger_pre_start| { -%>
7-
PassengerPreStart <%= $each_passenger_pre_start %>
5+
<% if $passenger_pre_start {-%>
6+
<%- [$passenger_pre_start].flatten().filter |$value| { $value }.each |$passenger_pre_start| {-%>
7+
PassengerPreStart <%= $passenger_pre_start %>
88
<%- } -%>
9-
<%- } -%>
9+
<% } -%>

‎templates/vhost/_file_header.epp

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,41 @@
33
# Managed by Puppet
44
# ************************************
55
<%= [$comment].flatten.map |$c| { "# ${c}" }.join("\n") -%>
6-
<%- if $mdomain { -%>
7-
<%- if type($mdomain) =~ Type[String] { -%>
6+
<% if $mdomain {-%>
7+
8+
<%- if type($mdomain) =~ Type[String] {-%>
9+
810
MDomain <%= $mdomain %>
9-
<%- } else { -%>
11+
<%-} else {-%>
1012
MDomain <%= $servername %>
1113
<%- } -%>
1214
<% } -%>
1315

1416
<VirtualHost <%= [$nvh_addr_port].flatten().filter |$value| { $value }.join(' ') %>>
15-
<%- $define.each | $k, $v| { -%>
17+
<% $define.each | $k, $v| {-%>
1618
Define <%= $k %> <%= $v %>
17-
<%- } -%>
18-
<%- if $servername and !$servername.empty { -%>
19+
<% } -%>
20+
<% if $servername and !$servername.empty {-%>
1921
ServerName <%= $servername %>
20-
<%- } -%>
21-
<%- if $serveradmin { -%>
22+
<% } -%>
23+
<% if $serveradmin {-%>
2224
ServerAdmin <%= $serveradmin %>
23-
<%- } -%>
24-
<%- unless $protocols.empty { -%>
25+
<% } -%>
26+
<%- unless $protocols.empty {-%>
2527
Protocols <%= join($protocols, ' ') %>
2628
<%- } -%>
27-
<%- if $protocols_honor_order != undef { -%>
29+
<%- unless $protocols_honor_order == undef {-%>
2830
ProtocolsHonorOrder <%= apache::bool2httpd($protocols_honor_order) %>
2931
<%- } -%>
30-
<%- if $limitreqfieldsize { -%>
32+
<% if $limitreqfieldsize {-%>
3133
LimitRequestFieldSize <%= $limitreqfieldsize %>
32-
<%- } -%>
33-
<%- if $limitreqfields { -%>
34+
<% } -%>
35+
<% if $limitreqfields {-%>
3436
LimitRequestFields <%= $limitreqfields %>
35-
<%- } -%>
36-
<%- if $limitreqline { -%>
37+
<% } -%>
38+
<% if $limitreqline {-%>
3739
LimitRequestLine <%= $limitreqline %>
38-
<%- } -%>
39-
<%- if $limitreqbody { -%>
40+
<% } -%>
41+
<% if $limitreqbody {-%>
4042
LimitRequestBody <%= $limitreqbody %>
41-
<%- } -%>
43+
<% } -%>

‎templates/vhost/_filters.epp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<%- unless $filters.empty { -%>
1+
<% unless $filters.empty {-%>
22

33
## Filter module rules
44
## as per http://httpd.apache.org/docs/2.4/mod/mod_filter.html
5-
<%- $filters.each |$filter| { -%>
5+
<%- $filters.each |$filter| {-%>
66
<%= $filter %>
77
<%- } -%>
8-
<%- } -%>
8+
<% } -%>

‎templates/vhost/_gssapi.epp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<%- |
2-
# https://github.com/gssapi/mod_auth_gssapi
3-
Optional[Variant[String[1], Enum['{HOSTNAME}']]] $acceptor_name = undef,
4-
Optional[Array[Enum['krb5', 'iakerb', 'ntlmssp']]] $allowed_mech = undef,
2+
# https://github.com/gssapi/mod_auth_gssapi
3+
Optional[Variant[String[1], Enum['{HOSTNAME}']]] $acceptor_name = undef,
4+
Optional[Array[Enum['krb5','iakerb','ntlmssp']]] $allowed_mech = undef,
55
Optional[Boolean] $basic_auth = undef,
6-
Optional[Array[Enum['krb5', 'iakerb', 'ntlmssp']]] $basic_auth_mech = undef,
6+
Optional[Array[Enum['krb5','iakerb','ntlmssp']]] $basic_auth_mech = undef,
77
Optional[[Integer[1]]] $basic_ticket_timeout = undef,
88
Optional[String[1]] $authname = undef,
99
Optional[String[1]] $authtype = undef,
@@ -30,7 +30,7 @@ Optional[Variant[String[1], Enum['{HOSTNAME}']]] $acceptor_name = undef,
3030
Optional[[String[1]]] $required_name_attributes = undef,
3131
Optional[[String[1]]] $session_key = undef,
3232
Optional[Boolean] $signal_persistent_auth = undef,
33-
Optional[Boolean] $ssl_only = undef,
33+
Optional[Boolean] $ssl_only = undef,
3434
Optional[Boolean] $use_s4u2_proxy = undef,
3535
Optional[Boolean] $use_sessions = undef,
3636
| -%>

‎templates/vhost/_header.epp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<%- unless $headers.empty { -%>
1+
<% unless $headers.empty {-%>
22

33
## Header rules
44
## as per http://httpd.apache.org/docs/2.4/mod/mod_headers.html#header
5-
<%- $headers.each |$header_statement| { -%>
5+
<%- $headers.each |$header_statement| {-%>
66
Header <%= $header_statement %>
77
<%- } -%>
8-
<%- } -%>
8+
<% } -%>

‎templates/vhost/_http2.epp

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
<%- if $h2_copy_files != undef { -%>
1+
<% if $h2_copy_files != undef {-%>
22
H2CopyFiles <%= apache::bool2httpd($h2_copy_files) %>
3-
<%- } -%>
4-
<%- if $h2_direct != undef { -%>
3+
<% } -%>
4+
<% if $h2_direct != undef {-%>
55
H2Direct <%= apache::bool2httpd($h2_direct) %>
6-
<%- } -%>
7-
<%- if $h2_early_hints != undef { -%>
6+
<% } -%>
7+
<% if $h2_early_hints != undef {-%>
88
H2EarlyHints <%= apache::bool2httpd($h2_early_hints) %>
9-
<%- } -%>
10-
<%- if $h2_max_session_streams != undef { -%>
9+
<% } -%>
10+
<% if $h2_max_session_streams != undef {-%>
1111
H2MaxSessionStreams <%= $h2_max_session_streams %>
12-
<%- } -%>
13-
<%- if $h2_modern_tls_only != undef { -%>
12+
<% } -%>
13+
<%- if $h2_modern_tls_only != undef {-%>
1414
H2ModernTLSOnly <%= apache::bool2httpd($h2_modern_tls_only) %>
1515
<%- } -%>
16-
<%- if $h2_push != undef { -%>
16+
<%- if $h2_push != undef {-%>
1717
H2Push <%= apache::bool2httpd($h2_push) %>
1818
<%- } -%>
19-
<%- if $h2_push_diary_size != undef { -%>
19+
<%- if $h2_push_diary_size != undef {-%>
2020
H2PushDiarySize <%= $h2_push_diary_size %>
2121
<%- } -%>
22-
<%- $h2_push_priority.each |$expr| { -%>
22+
<%- $h2_push_priority.each |$expr| {-%>
2323
H2PushPriority <%= $expr %>
2424
<%- } -%>
25-
<%- $h2_push_resource.each |$expr| { -%>
25+
<%- $h2_push_resource.each |$expr| {-%>
2626
H2PushResource <%= $expr %>
2727
<%- } -%>
28-
<%- if $h2_serialize_headers != undef { -%>
28+
<% if $h2_serialize_headers != undef {-%>
2929
H2SerializeHeaders <%= apache::bool2httpd($h2_serialize_headers) %>
30-
<%- } -%>
31-
<%- if $h2_stream_max_mem_size != undef { -%>
30+
<% } -%>
31+
<% if $h2_stream_max_mem_size != undef {-%>
3232
H2StreamMaxMemSize <%= $h2_stream_max_mem_size %>
33-
<%- } -%>
34-
<%- if $h2_tls_cool_down_secs != undef { -%>
33+
<% } -%>
34+
<%- if $h2_tls_cool_down_secs != undef {-%>
3535
H2TLSCoolDownSecs <%= $h2_tls_cool_down_secs %>
3636
<%- } -%>
37-
<%- if $h2_tls_warm_up_size != undef { -%>
37+
<%- if $h2_tls_warm_up_size != undef {-%>
3838
H2TLSWarmUpSize <%= $h2_tls_warm_up_size %>
3939
<%- } -%>
40-
<%- if $h2_upgrade != undef { -%>
40+
<% if $h2_upgrade != undef {-%>
4141
H2Upgrade <%= apache::bool2httpd($h2_upgrade) %>
42-
<%- } -%>
43-
<%- if $h2_window_size != undef { -%>
42+
<% } -%>
43+
<% if $h2_window_size != undef {-%>
4444
H2WindowSize <%= $h2_window_size %>
45-
<%- } -%>
45+
<% } -%>

‎templates/vhost/_itk.epp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
<%- if $itk and !$itk.empty { -%>
1+
<% if $itk and ! $itk.empty {-%>
22

33
## ITK statement
44
<IfModule mpm_itk_module>
5-
<%- if $itk["user"] and $itk["group"] { -%>
5+
<%- if $itk["user"] and $itk["group"] {-%>
66
AssignUserId <%= $itk["user"] %> <%= $itk["group"] %>
77
<%- } -%>
8-
<%- if $itk["assignuseridexpr"] { -%>
8+
<%- if $itk["assignuseridexpr"] {-%>
99
AssignUserIdExpr <%= $itk["assignuseridexpr"] %>
1010
<%- } -%>
11-
<%- if $itk["assigngroupidexpr"] { -%>
11+
<%- if $itk["assigngroupidexpr"] {-%>
1212
AssignGroupIdExpr <%= $itk["assigngroupidexpr"] %>
1313
<%- } -%>
14-
<%- if $itk["maxclientvhost"] { -%>
14+
<%- if $itk["maxclientvhost"] {-%>
1515
MaxClientsVHost <%= $itk["maxclientvhost"] %>
1616
<%- } -%>
17-
<%- if $itk["nice"] { -%>
17+
<%- if $itk["nice"] {-%>
1818
NiceValue <%= $itk["nice"] %>
1919
<%- } -%>
20-
<%- if $kernelversion >= '3.5.0' { -%>
21-
<%- if $itk["limituidrange"] { -%>
20+
<%- if $kernelversion >= '3.5.0' {-%>
21+
<%- if $itk["limituidrange"] {-%>
2222
LimitUIDRange <%= $itk["limituidrange"] %>
2323
<%- } -%>
24-
<%- if $itk["limitgidrange"] { -%>
24+
<%- if $itk["limitgidrange"] {-%>
2525
LimitGIDRange <%= $itk["limitgidrange"] %>
2626
<%- } -%>
2727
<%- } -%>
2828
</IfModule>
29-
<%- } -%>
29+
<% } -%>

‎templates/vhost/_jk_mounts.epp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<%- unless $jk_mounts.empty { -%>
1+
<% unless $jk_mounts.empty {-%>
22

3-
<%- $jk_mounts.each |$jk| { -%>
4-
<%- if $jk['mount'] != undef and $jk['worker'] != undef { -%>
3+
<%- $jk_mounts.each |$jk| {-%>
4+
<%- if $jk['mount'] != undef and $jk['worker'] != undef {-%>
55
JkMount <%= $jk['mount'] %> <%= $jk['worker'] %>
6-
<%- } elsif $jk['unmount'] != undef and $jk['worker'] != undef { -%>
6+
<%-} elsif $jk['unmount'] != undef and $jk['worker'] != undef {-%>
77
JkUnMount <%= $jk['unmount'] %> <%= $jk['worker'] %>
88
<%- } -%>
99
<%- } -%>
10-
<%- } -%>
10+
<% } -%>

‎templates/vhost/_logging.epp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
<%- if $error_log or $log_level { -%>
1+
<% if $error_log or $log_level {-%>
22

33
## Logging
4-
<%- } -%>
5-
<%- if $error_log { -%>
4+
<% } -%>
5+
<% if $error_log {-%>
66
ErrorLog "<%= $error_log_destination %>"
7-
<%- } -%>
8-
<%- if $log_level { -%>
7+
<% } -%>
8+
<% if $log_level {-%>
99
LogLevel <%= $log_level %>
10-
<%- } -%>
11-
<%- if $error_log_format { -%>
12-
<%- $error_log_format.each |$lfmt| { -%>
13-
<%- if type($lfmt) =~ Type[Hash] { -%>
14-
<%- $lfmt.each |$fmt, $flag| { -%>
10+
<% } -%>
11+
<% if $error_log_format {-%>
12+
<%- $error_log_format.each |$lfmt| {-%>
13+
<%- if type($lfmt) =~ Type[Hash] {-%>
14+
<%- $lfmt.each |$fmt, $flag| {-%>
1515
ErrorLogFormat <%= $flag %> "<%= $fmt %>"
1616
<%- } -%>
17-
<%- } else { -%>
17+
<%-} else {-%>
1818
ErrorLogFormat "<%= $lfmt %>"
1919
<%- } -%>
2020
<%- } -%>
21-
<%- } -%>
21+
<% } -%>

0 commit comments

Comments
 (0)