Change to use osfamily fact to support CentOS (3070baf9) · Commits · puppetpublic / apache

NEWS

+4 −0

Original line number	Diff line number	Diff line
		release/001.014 (2015-05-13)

		Changes to use osfamily fact to support CentOS (jlent)

		release/001.013 (2015-03-31)

		Add support for apache 2.4 on Debian jessie systems. (whm)

manifests/cert/comodo.pp

+12 −16

Original line number	Diff line number	Diff line
		@@ -71,10 +71,9 @@ define apache::cert::comodo(
		default => $group,
		},
		mode => $mode,
		require => $::operatingsystem ? {
		'debian' => Package['ca-certificates'],
		'ubuntu' => Package['ca-certificates'],
		'redhat' => $lsbmajdistrelease ? {
		require => $::osfamily ? {
		'Debian' => Package['ca-certificates'],
		'RedHat' => $lsbmajdistrelease ? {
		'6' => Package['ca-certificates'],
		default => [ Package['openssl'],
		File['/etc/ssl/private'] ],
		@@ -89,10 +88,9 @@ define apache::cert::comodo(
		undef => "puppet:///modules/cert-files/${name}.stanford.edu",
		default => "puppet:///modules/cert-files/$identity",
		},
		require => $::operatingsystem ? {
		'debian' => Package['ca-certificates'],
		'ubuntu' => Package['ca-certificates'],
		'redhat' => $lsbmajdistrelease ? {
		require => $::osfamily ? {
		'Debian' => Package['ca-certificates'],
		'RedHat' => $lsbmajdistrelease ? {
		'6' => Package['ca-certificates'],
		default => [ Package['openssl'],
		File['/etc/ssl/private'] ],
		@@ -112,10 +110,9 @@ define apache::cert::comodo(
		default => $ensure,
		},
		target => "${name}.pem",
		require => $::operatingsystem ? {
		'debian' => Package['ca-certificates'],
		'ubuntu' => Package['ca-certificates'],
		'redhat' => $lsbmajdistrelease ? {
		require => $::osfamily ? {
		'Debian' => Package['ca-certificates'],
		'RedHat' => $lsbmajdistrelease ? {
		'6' => Package['ca-certificates'],
		default => [ Package['openssl'],
		File['/etc/ssl/private'] ],
		@@ -129,10 +126,9 @@ define apache::cert::comodo(
		default => $ensure,
		},
		target => "${name}.key",
		require => $operatingsystem ? {
		'debian' => Package['ca-certificates'],
		'ubuntu' => Package['ca-certificates'],
		'redhat' => $lsbmajdistrelease ? {
		require => $osfamily ? {
		'Debian' => Package['ca-certificates'],
		'RedHat' => $lsbmajdistrelease ? {
		'6' => Package['ca-certificates'],
		default => [ Package['openssl'],
		File['/etc/ssl/private'] ],

manifests/cert/hash.pp

+3 −6

Original line number	Diff line number	Diff line
		@@ -16,14 +16,11 @@ define apache::cert::hash(
		exec { "openssl hash link ${directory}/${name}":
		command => "ln -s ${directory}/${name} ${directory}/${hashcommand}.0",
		unless => "[ -f \"${directory}/${hashcommand}.0\" ]",
		require => $::operatingsystem ? {
		'debian' => [ File["${directory}/${name}"],
		require => $::osfamily ? {
		'Debian' => [ File["${directory}/${name}"],
		Package['ca-certificates'],
		Package['openssl'] ],
		'ubuntu' => [ File["${directory}/${name}"],
		Package['ca-certificates'],
		Package['openssl'] ],
		'redhat' => [ File["${directory}/${name}"], Package['openssl'] ],
		'RedHat' => [ File["${directory}/${name}"], Package['openssl'] ],
		},
		}
		}

manifests/cert/packages.pp

+12 −15

Original line number	Diff line number	Diff line
		@@ -7,10 +7,9 @@ define apache::cert::packages::root($ensure) {
		file { "/etc/ssl/certs/${name}.pem":
		ensure => $ensure,
		source => "puppet:///modules/apache/etc/ssl/certs/${name}.pem",
		require => $::operatingsystem ? {
		'debian' => Package['ca-certificates'],
		'ubuntu' => Package['ca-certificates'],
		'redhat' => $::lsbmajdistrelease ? {
		require => $::osfamily ? {
		'Debian' => Package['ca-certificates'],
		'RedHat' => $::lsbmajdistrelease ? {
		'6' => Package['ca-certificates'],
		default => [ Package['openssl'], File['/etc/ssl/private'] ],
		},
		@@ -23,14 +22,14 @@ class apache::cert::packages {
		package { 'openssl': ensure => present }

		# Install the basic certificate handling infrastructure.
		case $::operatingsystem {
		'debian', 'ubuntu': {
		case $::osfamily {
		'Debian': {
		package { 'ca-certificates': ensure => present }
		}

		# The ca-certificates package on Debian and RHEL6 provides this, but no
		# package on Red Hat does.
		'redhat': {
		'RedHat': {
		file {
		'/etc/ssl':
		ensure => directory,
		@@ -73,10 +72,9 @@ class apache::cert::packages {
		# and both certificates in this file are also provided elsewhere.
		file { '/etc/ssl/certs/comodo-incommon-addtrust-bundle-2020.pem':
		source => 'puppet:///modules/apache/etc/ssl/certs/comodo-incommon-addtrust-bundle-2020.pem',
		require => $::operatingsystem ? {
		'debian' => Package['ca-certificates'],
		'ubuntu' => Package['ca-certificates'],
		'redhat' => $::lsbmajdistrelease ? {
		require => $::osfamily ? {
		'Debian' => Package['ca-certificates'],
		'RedHat' => $::lsbmajdistrelease ? {
		'6' => Package['ca-certificates'],
		default => [ Package['openssl'], File['/etc/ssl/private'] ],
		},
		@@ -87,10 +85,9 @@ class apache::cert::packages {
		# bundle.
		file { '/etc/ssl/certs/incommon-usertrust-addtrust-bundle-2020.pem':
		source => 'puppet:///modules/apache/etc/ssl/certs/incommon-usertrust-addtrust-bundle-2020.pem',
		require => $::operatingsystem ? {
		'debian' => Package['ca-certificates'],
		'ubuntu' => Package['ca-certificates'],
		'redhat' => $::lsbmajdistrelease ? {
		require => $::osfamily ? {
		'Debian' => Package['ca-certificates'],
		'RedHat' => $::lsbmajdistrelease ? {
		'6' => Package['ca-certificates'],
		default => [ Package['openssl'], File['/etc/ssl/private'] ],
		},

manifests/cert/self_signed.pp

+3 −6

Original line number	Diff line number	Diff line
		@@ -65,14 +65,11 @@ define apache::cert::self_signed(
		exec { "make-local-cert ${identity}":
		command => "/usr/sbin/make-local-cert ${flags} ${identity}",
		creates => "${certdir}/${filename}",
		require => $operatingsystem ? {
		'debian' => [ Package["ca-certificates"],
		require => $::osfamily ? {
		'Debian' => [ Package["ca-certificates"],
		Package["openssl"],
		Package["stanford-server"] ],
		'ubuntu' => [ Package["ca-certificates"],
		Package["openssl"],
		Package["stanford-server"] ],
		'redhat' => [ Package["openssl"],
		'RedHat' => [ Package["openssl"],
		Package["stanford-server"],
		File["/etc/ssl/certs"] ],
		},

Admin message