ca-certificate changes for RHEL6 (084a7c00) · Commits · puppetpublic / apache

NEWS

+11 −0

Original line number	Diff line number	Diff line
		UNRELEASED

		None at this time.

		release/001.004 (2014-03-26)

		ca-certificates in a recent update for RHEL6 now provides the directory
		handling that we were taking care of. This handling conflicted with the
		package update. Note that if you are upgrading the package you should move
		aside the current /etc/ssl/certs, let the package recreate it, then oneshot
		to repopulate the certs dir. (vdc)

		Removed files/mysql-ca files that do not belong in this module and rewrote
		the s_mysql service class in the IDG Puppet repository to not use
		them. (adamhl)

+20 −4

Original line number	Diff line number	Diff line
		@@ -74,7 +74,11 @@ define apache::cert::comodo(
		require => $::operatingsystem ? {
		'debian' => Package['ca-certificates'],
		'ubuntu' => Package['ca-certificates'],
		'redhat' => [ Package['openssl'], File['/etc/ssl/private'] ],
		'redhat' => $lsbmajdistrelease ? {
		'6' => Package['ca-certificates'],
		default => [ Package['openssl'],
		File['/etc/ssl/private'] ],
		},
		},
		}

		@@ -88,7 +92,11 @@ define apache::cert::comodo(
		require => $::operatingsystem ? {
		'debian' => Package['ca-certificates'],
		'ubuntu' => Package['ca-certificates'],
		'redhat' => [ Package['openssl'], File['/etc/ssl/certs'] ],
		'redhat' => $lsbmajdistrelease ? {
		'6' => Package['ca-certificates'],
		default => [ Package['openssl'],
		File['/etc/ssl/private'] ],
		},
		},
		}

		@@ -107,7 +115,11 @@ define apache::cert::comodo(
		require => $::operatingsystem ? {
		'debian' => Package['ca-certificates'],
		'ubuntu' => Package['ca-certificates'],
		'redhat' => [ Package['openssl'], File['/etc/ssl/certs'] ],
		'redhat' => $lsbmajdistrelease ? {
		'6' => Package['ca-certificates'],
		default => [ Package['openssl'],
		File['/etc/ssl/private'] ],
		},
		},
		}
		file { '/etc/ssl/private/server.key':
		@@ -120,7 +132,11 @@ define apache::cert::comodo(
		require => $operatingsystem ? {
		'debian' => Package['ca-certificates'],
		'ubuntu' => Package['ca-certificates'],
		'redhat' => [ Package['openssl'], File['/etc/ssl/private'] ],
		'redhat' => $lsbmajdistrelease ? {
		'6' => Package['ca-certificates'],
		default => [ Package['openssl'],
		File['/etc/ssl/private'] ],
		},
		},
		}
		}

+25 −12

Original line number	Diff line number	Diff line
		@@ -10,7 +10,10 @@ define apache::cert::packages::root($ensure) {
		require => $::operatingsystem ? {
		'debian' => Package['ca-certificates'],
		'ubuntu' => Package['ca-certificates'],
		'redhat' => [ Package['openssl'], File['/etc/ssl/certs'] ],
		'redhat' => $lsbmajdistrelease ? {
		'6' => Package['ca-certificates'],
		default => [ Package['openssl'], File['/etc/ssl/private'] ],
		},
		},
		}
		apache::cert::hash { "${name}.pem": ensure => $ensure }
		@@ -25,19 +28,29 @@ class apache::cert::packages {
		package { 'ca-certificates': ensure => present }
		}

		# The ca-certificates package on Debian provides this, but no package on
		# Red Hat does.
		# The ca-certificates package on Debian and RHEL6 provides this, but no
		# package on Red Hat does.
		'redhat': {
		if ($lsbmajdistrelease == '4') or ($lsbmajdistrelease == '5') {
		file {
		'/etc/ssl':
		ensure => directory,
		mode => '0755';
		mode => 0755;
		'/etc/ssl/certs':
		ensure => directory,
		mode => '0755';
		mode => 0755;
		'/etc/ssl/private':
		ensure => directory,
		mode => '0710';
		mode => 0710;
		}
		}
		else {
		package { 'ca-certificates': ensure => present }

		file { '/etc/ssl/private':
		ensure => directory,
		mode => 0710,
		}
		}
		}
		}