(PA-5786) Revert "(maint) Revert "Merge pull request puppetlabs#2410 from tvpartytonight/PA-5786_use_new_vanagon_method""

tvpartytonight · tvpartytonight · commit 51e185ad6ff4 · 2023-11-09T15:41:07.000-08:00
This reverts commit d4e2228.
diff --git a/configs/components/openssl-fips.rb b/configs/components/openssl-fips.rb
@@ -73,7 +73,7 @@
   #
   if platform.is_rpm?
     # If you modify the following code, update customactions.wxs.erb too!
-    pkg.add_postinstall_action ["install", "upgrade"],
+    pkg.add_postinstall_required_action ["install", "upgrade"],
       [<<-HERE.undent
         OPENSSL_CONF=/opt/puppetlabs/puppet/ssl/openssl.cnf.dist /opt/puppetlabs/puppet/bin/openssl fipsinstall -module /opt/puppetlabs/puppet/lib/ossl-modules/fips.so -provider_name fips -out /opt/puppetlabs/puppet/ssl/fipsmodule.cnf
         /usr/bin/cp --preserve /opt/puppetlabs/puppet/ssl/openssl-fips.cnf /opt/puppetlabs/puppet/ssl/openssl.cnf

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@`
`73`	`73`	`#`
`74`	`74`	`if platform.is_rpm?`
`75`	`75`	`# If you modify the following code, update customactions.wxs.erb too!`
`76`		`- pkg.add_postinstall_action ["install", "upgrade"],`
	`76`	`+ pkg.add_postinstall_required_action ["install", "upgrade"],`
`77`	`77`	`[<<-HERE.undent`
`78`	`78`	`OPENSSL_CONF=/opt/puppetlabs/puppet/ssl/openssl.cnf.dist /opt/puppetlabs/puppet/bin/openssl fipsinstall -module /opt/puppetlabs/puppet/lib/ossl-modules/fips.so -provider_name fips -out /opt/puppetlabs/puppet/ssl/fipsmodule.cnf`
`79`	`79`	`/usr/bin/cp --preserve /opt/puppetlabs/puppet/ssl/openssl-fips.cnf /opt/puppetlabs/puppet/ssl/openssl.cnf`