Merge "Fix defined type namespacing"

This commit is contained in:
Zuul 2018-06-05 22:32:13 +00:00 committed by Gerrit Code Review
commit a167059234

View File

@ -40,17 +40,17 @@ class etherpad_lite::apache (
ssl => true, ssl => true,
} }
if !defined(Mod['rewrite']) { if !defined(Httpd::Mod['rewrite']) {
httpd::mod { 'rewrite': httpd::mod { 'rewrite':
ensure => present, ensure => present,
} }
} }
if !defined(Mod['proxy']) { if !defined(Httpd::Mod['proxy']) {
httpd::mod { 'proxy': httpd::mod { 'proxy':
ensure => present, ensure => present,
} }
} }
if !defined(Mod['proxy_http']) { if !defined(Httpd::Mod['proxy_http']) {
httpd::mod { 'proxy_http': httpd::mod { 'proxy_http':
ensure => present, ensure => present,
} }
@ -61,7 +61,7 @@ class etherpad_lite::apache (
ensure => present, ensure => present,
} }
} }
if !defined(Mod['auth_openid']) { if !defined(Httpd::Mod['auth_openid']) {
httpd::mod { 'auth_openid': httpd::mod { 'auth_openid':
ensure => present, ensure => present,
require => Package['libapache2-mod-auth-openid'], require => Package['libapache2-mod-auth-openid'],