Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add nssdb files for EL8 #244

Merged
merged 1 commit into from
Feb 21, 2019
Merged

Add nssdb files for EL8 #244

merged 1 commit into from
Feb 21, 2019

Conversation

ehelms
Copy link
Member

@ehelms ehelms commented Feb 20, 2019

No description provided.

manifests/ssltools/nssdb.pp Outdated Show resolved Hide resolved
@ehelms ehelms force-pushed the add-more-nssdb branch 2 times, most recently from eca978a to 45c925e Compare February 20, 2019 20:55
Copy link
Member

@evgeni evgeni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the one hand I wonder if this should be a vercmp for >= 8, on the other EL9 is so far in the future, that I probably don't care :)

@@ -6,7 +6,15 @@
Exec { logoutput => 'on_failure' }

$nss_db_password_file = "${nss_db_dir}/nss_db_password-file"
$nssdb_files = ["${nss_db_dir}/cert8.db", "${nss_db_dir}/key3.db", "${nss_db_dir}/secmod.db"]

case $facts['operatingsystemmajrelease'] {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I agree with @evgeni that we should be future compatible. How about:

$nssdb_files = $facts['operatingsystemmajrelease'] ? {
  '7'     => ["${nss_db_dir}/cert8.db", "${nss_db_dir}/key3.db", "${nss_db_dir}/secmod.db"],
  default => ["${nss_db_dir}/cert9.db", "${nss_db_dir}/key4.db", "${nss_db_dir}/pkcs11.txt"],
}

@ehelms
Copy link
Member Author

ehelms commented Feb 21, 2019

Updated to change the default

Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do think the selector I suggested is a bit more readable but I'm fine either way.

@ehelms ehelms merged commit a9ad253 into theforeman:master Feb 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants