Avoid relative classname inclusion

Julien Pivotto · Julien Pivotto · commit b16618649e72 · 2016-12-03T07:08:29.000+01:00
Including a class by a relative name might lead to unexpected results;
in addition to that there is also a small performance penalty.

Signed-off-by: Julien Pivotto &lt;roidelapluie@inuits.eu&gt;
diff --git a/examples/apache.pp b/examples/apache.pp
@@ -1,6 +1,6 @@
-include apache
-include apache::mod::php
-include apache::mod::cgi
-include apache::mod::userdir
-include apache::mod::disk_cache
-include apache::mod::proxy_http
+include ::apache
+include ::apache::mod::php
+include ::apache::mod::cgi
+include ::apache::mod::userdir
+include ::apache::mod::disk_cache
+include ::apache::mod::proxy_http
diff --git a/examples/dev.pp b/examples/dev.pp
@@ -1 +1 @@
-include apache::mod::dev
+include ::apache::mod::dev
diff --git a/examples/init.pp b/examples/init.pp
@@ -1 +1 @@
-include apache
+include ::apache
diff --git a/examples/mod_load_params.pp b/examples/mod_load_params.pp
@@ -1,7 +1,7 @@
 # Tests the path and identifier parameters for the apache::mod class
 
 # Base class for clarity:
-class { 'apache': }
+class { '::apache': }
 
 
 # Exaple parameter usage:
diff --git a/examples/mods.pp b/examples/mods.pp
@@ -3,7 +3,7 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot, and declaring our default set of modules.
-class { 'apache':
+class { '::apache':
   default_mods => true,
 }
 
diff --git a/examples/mods_custom.pp b/examples/mods_custom.pp
@@ -3,7 +3,7 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot, and declaring a custom set of modules.
-class { 'apache':
+class { '::apache':
   default_mods => [
     'info',
     'alias',
diff --git a/examples/php.pp b/examples/php.pp
@@ -1,4 +1,4 @@
-class { 'apache':
+class { '::apache':
   mpm_module => 'prefork',
 }
-include apache::mod::php
+include ::apache::mod::php
diff --git a/examples/vhost.pp b/examples/vhost.pp
@@ -5,7 +5,7 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot
-class { 'apache': }
+class { '::apache': }
 
 # Most basic vhost
 apache::vhost { 'first.example.com':
diff --git a/examples/vhost_directories.pp b/examples/vhost_directories.pp
@@ -1,7 +1,7 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot
-class { 'apache': }
+class { '::apache': }
 
 # Example from README adapted.
 apache::vhost { 'readme.example.net':
diff --git a/examples/vhost_filter.pp b/examples/vhost_filter.pp
@@ -1,5 +1,5 @@
 # Base class. Declares default vhost on port 80 with filters.
-class { 'apache': }
+class { '::apache': }
 
 # Example from README adapted.
 apache::vhost { 'readme.example.net':
diff --git a/examples/vhost_ip_based.pp b/examples/vhost_ip_based.pp
@@ -3,7 +3,7 @@
 
 # Base class. Turn off the default vhosts; we will be declaring
 # all vhosts below.
-class { 'apache':
+class { '::apache':
   default_vhost => false,
 }
 
diff --git a/examples/vhost_proxypass.pp b/examples/vhost_proxypass.pp
@@ -5,7 +5,7 @@
 # Base class. Declares default vhost on port 80 and default ssl
 # vhost on port 443 listening on all interfaces and serving
 # $apache::docroot
-class { 'apache': }
+class { '::apache': }
 
 # Most basic vhost with proxy_pass
 apache::vhost { 'first.example.com':
diff --git a/examples/vhost_ssl.pp b/examples/vhost_ssl.pp
@@ -3,7 +3,7 @@
 
 # Base class. Turn off the default vhosts; we will be declaring
 # all vhosts below.
-class { 'apache':
+class { '::apache':
   default_vhost => false,
 }
 
diff --git a/examples/vhosts_without_listen.pp b/examples/vhosts_without_listen.pp
@@ -4,7 +4,7 @@
 
 # Base class. Turn off the default vhosts; we will be declaring
 # all vhosts below.
-class { 'apache':
+class { '::apache':
   default_vhost => false,
 }
 
diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp
@@ -7,7 +7,7 @@
   $file_type     = 'application/x-httpd-php',
   $pass_header   = undef,
 ) {
-  include apache::mod::fastcgi
+  include ::apache::mod::fastcgi
 
   Apache::Mod['fastcgi'] -> Apache::Fastcgi::Server[$title]
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include apache::mod::dev`
	`1`	`+include ::apache::mod::dev`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Base class. Declares default vhost on port 80 and default ssl`
`4`	`4`	`# vhost on port 443 listening on all interfaces and serving`
`5`	`5`	`# $apache::docroot, and declaring our default set of modules.`
`6`		`-class { 'apache':`
	`6`	`+class { '::apache':`
`7`	`7`	`default_mods => true,`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-class { 'apache':`
	`1`	`+class { '::apache':`
`2`	`2`	`mpm_module => 'prefork',`
`3`	`3`	`}`
`4`		`-include apache::mod::php`
	`4`	`+include ::apache::mod::php`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`# Base class. Turn off the default vhosts; we will be declaring`
`5`	`5`	`# all vhosts below.`
`6`		`-class { 'apache':`
	`6`	`+class { '::apache':`
`7`	`7`	`default_vhost => false,`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`# Base class. Turn off the default vhosts; we will be declaring`
`6`	`6`	`# all vhosts below.`
`7`		`-class { 'apache':`
	`7`	`+class { '::apache':`
`8`	`8`	`default_vhost => false,`
`9`	`9`	`}`
`10`	`10`