Skip to content

Commit 3ee4bf7

Browse files
Dinesh GujarDinesh Gujar
Dinesh Gujar
authored and
Dinesh Gujar
committed
CAT-1347 resolving review comments
1 parent 7b74cd3 commit 3ee4bf7

File tree

1 file changed

+61
-0
lines changed

1 file changed

+61
-0
lines changed

manifests/vhost.pp

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2409,6 +2409,12 @@
24092409
content => " ServerSignature Off\n",
24102410
}
24112411

2412+
# Template uses:
2413+
# - $_access_logs
2414+
# - $_access_log_env_var
2415+
# - $access_log_destination
2416+
# - $_access_log_format
2417+
# - $_access_log_env_var
24122418
if !empty($_access_logs) {
24132419
concat::fragment { "${name}-access_log":
24142420
target => "${priority_real}${filename}.conf",
@@ -2425,6 +2431,8 @@
24252431
}
24262432
}
24272433

2434+
# Template uses:
2435+
# - $block
24282436
if $block and ! empty($block) {
24292437
concat::fragment { "${name}-block":
24302438
target => "${priority_real}${filename}.conf",
@@ -2433,6 +2441,8 @@
24332441
}
24342442
}
24352443

2444+
# Template uses:
2445+
# - $error_documents
24362446
if $error_documents and ! empty($error_documents) {
24372447
concat::fragment { "${name}-error_document":
24382448
target => "${priority_real}${filename}.conf",
@@ -2514,6 +2524,19 @@
25142524
}
25152525
}
25162526

2527+
# Template uses:
2528+
# - $redirect_source
2529+
# - $redirect_dest
2530+
# - $redirect_status
2531+
# - $redirect_dest_a
2532+
# - $redirect_source_a
2533+
# - $redirect_status_a
2534+
# - $redirectmatch_status
2535+
# - $redirectmatch_regexp
2536+
# - $redirectmatch_dest
2537+
# - $redirectmatch_status_a
2538+
# - $redirectmatch_regexp_a
2539+
# - $redirectmatch_dest
25172540
if (($redirect_source and $redirect_dest) or ($redirectmatch_regexp and $redirectmatch_dest)) and $ensure == 'present' {
25182541
include apache::mod::alias
25192542

@@ -2524,6 +2547,13 @@
25242547
}
25252548
}
25262549

2550+
# Template uses:
2551+
# - $rewrites
2552+
# - $rewrite_inherit
2553+
# - $rewrite_base
2554+
# - $rewrite_rule
2555+
# - $rewrite_cond
2556+
# - $rewrite_map
25272557
if (! empty($rewrites) or $rewrite_rule or $rewrite_inherit) and $ensure == 'present' {
25282558
include apache::mod::rewrite
25292559
$rewrite_params = {
@@ -2557,6 +2587,10 @@
25572587
}
25582588
}
25592589

2590+
# Template uses:
2591+
# - $setenv
2592+
# - $setenvif
2593+
# - $setenvifnocase
25602594
$use_env_mod = !empty($setenv)
25612595
$use_setenvif_mod = !empty($setenvif) or !empty($setenvifnocase)
25622596
if ($use_env_mod or $use_setenvif_mod) and $ensure == 'present' {
@@ -2574,6 +2608,25 @@
25742608
}
25752609
}
25762610

2611+
# Template uses:
2612+
# - $ssl
2613+
# - $ssl_cert
2614+
# - $ssl_key
2615+
# - $ssl_chain
2616+
# - $ssl_certs_dir
2617+
# - $ssl_ca
2618+
# - $ssl_crl_path
2619+
# - $ssl_crl
2620+
# - $ssl_crl_check
2621+
# - $ssl_protocol
2622+
# - $ssl_cipher
2623+
# - $_ssl_honorcipherorder
2624+
# - $ssl_verify_client
2625+
# - $ssl_verify_depth
2626+
# - $ssl_options
2627+
# - $ssl_openssl_conf_cmd
2628+
# - $ssl_stapling
2629+
# - $mdomain
25772630
if $ssl and $ensure == 'present' {
25782631
include apache::mod::ssl
25792632

@@ -2623,6 +2676,9 @@
26232676
}
26242677
}
26252678

2679+
# Template uses:
2680+
# - $php_values
2681+
# - $php_flags
26262682
if ($php_values and ! empty($php_values)) or ($php_flags and ! empty($php_flags)) {
26272683
concat::fragment { "${name}-php":
26282684
target => "${priority_real}${filename}.conf",
@@ -2631,6 +2687,9 @@
26312687
}
26322688
}
26332689

2690+
# Template uses:
2691+
# - $php_admin_values
2692+
# - $php_admin_flags
26342693
if ($php_admin_values and ! empty($php_admin_values)) or ($php_admin_flags and ! empty($php_admin_flags)) {
26352694
concat::fragment { "${name}-php_admin":
26362695
target => "${priority_real}${filename}.conf",
@@ -2664,6 +2723,8 @@
26642723
}
26652724
}
26662725

2726+
# Template uses:
2727+
# - $custom_fragment
26672728
if $custom_fragment {
26682729
$custom_fragment_params = {
26692730
'custom_fragment' => $custom_fragment,

0 commit comments

Comments
 (0)