CAT-1347 cleanup

Dinesh Gujar · Dinesh Gujar · commit 1935b2b5c9a5 · 2023-09-28T12:08:50.000+05:30
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -2371,6 +2371,9 @@
     }
   }
 
+  # Template uses:
+  # - $additional_includes
+  # - $use_optional_includes
   if $additional_includes and ! empty($additional_includes) {
     concat::fragment { "${name}-additional_includes":
       target  => "${priority_real}${filename}.conf",
@@ -2541,8 +2544,6 @@
     }
   }
 
-  # Template uses:
-  # - $scriptalias
   if $scriptalias and $ensure == 'present' {
     include apache::mod::alias
     concat::fragment { "${name}-scriptalias":
@@ -2947,9 +2948,6 @@
     }
   }
 
-  # Template uses:
-  # - $define
-  # - $passenger_pre_start
   $file_footer_params = {
     'define'              => $define,
     'passenger_pre_start' => $passenger_pre_start,

Original file line number	Diff line number	Diff line change
`@@ -2371,6 +2371,9 @@`
`2371`	`2371`	`}`
`2372`	`2372`	`}`
`2373`	`2373`
	`2374`	`+ # Template uses:`
	`2375`	`+ # - $additional_includes`
	`2376`	`+ # - $use_optional_includes`
`2374`	`2377`	`if $additional_includes and ! empty($additional_includes) {`
`2375`	`2378`	`concat::fragment { "${name}-additional_includes":`
`2376`	`2379`	`target => "${priority_real}${filename}.conf",`
`@@ -2541,8 +2544,6 @@`
`2541`	`2544`	`}`
`2542`	`2545`	`}`
`2543`	`2546`
`2544`		`- # Template uses:`
`2545`		`- # - $scriptalias`
`2546`	`2547`	`if $scriptalias and $ensure == 'present' {`
`2547`	`2548`	`include apache::mod::alias`
`2548`	`2549`	`concat::fragment { "${name}-scriptalias":`
`@@ -2947,9 +2948,6 @@`
`2947`	`2948`	`}`
`2948`	`2949`	`}`
`2949`	`2950`
`2950`		`- # Template uses:`
`2951`		`- # - $define`
`2952`		`- # - $passenger_pre_start`
`2953`	`2951`	`$file_footer_params = {`
`2954`	`2952`	`'define' => $define,`
`2955`	`2953`	`'passenger_pre_start' => $passenger_pre_start,`