release/001.019 (apache::local jessie fix) (e7caed91) · Commits · puppetpublic / apache

NEWS

+6 −0

Original line number	Diff line number	Diff line
		release/001.019 (2017-01-18)

		In apache::local attempt to set permissions on files in
		/etc/apache2/conf.d only for Debian wheezy (/etc/apache2/conf.d is no
		longer included on Debian resleases from jessie onwards) (adamhl).

		release/001.018 (2016-08-01)

		Ignore more innocuous Cyrus SASL GSSAPI messages (adamhl).

+24 −16

Original line number	Diff line number	Diff line
		@@ -38,9 +38,14 @@ class apache::local inherits apache {
		}
		}
		'Debian': {
		# In Debian jessie and later, configuration files are in either
		# sites-available or conf-available. In particular,
		# /etc/apache2/conf.d is no longer used. So, we set permissions on
		# files in /etc/apache2/conf.d/ only for wheezy.
		if ($::lsbdistcodename == 'wheezy') {
		file {
		'/etc/apache2/conf.d/local':
		ensure => file,
		ensure => present,
		group => 'webconfig',
		mode => '0664',
		require => [ Group['webconfig'], Package['apache'] ];
		@@ -49,18 +54,21 @@ class apache::local inherits apache {
		mode => '0644',
		content => template('apache/local.sample.erb'),
		require => [ Group['webconfig'], Package['apache'] ];
		}
		}
		file {
		'/var/log/apache2':
		ensure => directory,
		group => 'webconfig',
		mode => '0644',
		require => Group['webconfig'];
		'/var/log/apache2/error.log':
		ensure => file,
		ensure => present,
		group => 'webconfig',
		mode => '0644',
		require => Group['webconfig'];
		'/var/log/apache2/access.log':
		ensure => file,
		ensure => present,
		group => 'webconfig',
		mode => '0644',
		require => Group['webconfig'];