Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1566 from roidelapluie/relclass
Avoid relative classname inclusion
  • Loading branch information
hunner committed Dec 5, 2016
2 parents 69b7277 + b166186 commit 498592d
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 21 deletions.
12 changes: 6 additions & 6 deletions 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
2 changes: 1 addition & 1 deletion examples/dev.pp
@@ -1 +1 @@
include apache::mod::dev
include ::apache::mod::dev
2 changes: 1 addition & 1 deletion examples/init.pp
@@ -1 +1 @@
include apache
include ::apache
2 changes: 1 addition & 1 deletion 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:
Expand Down
2 changes: 1 addition & 1 deletion examples/mods.pp
Expand Up @@ -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,
}

2 changes: 1 addition & 1 deletion examples/mods_custom.pp
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions examples/php.pp
@@ -1,4 +1,4 @@
class { 'apache':
class { '::apache':
mpm_module => 'prefork',
}
include apache::mod::php
include ::apache::mod::php
2 changes: 1 addition & 1 deletion examples/vhost.pp
Expand Up @@ -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':
Expand Down
2 changes: 1 addition & 1 deletion 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':
Expand Down
2 changes: 1 addition & 1 deletion 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':
Expand Down
2 changes: 1 addition & 1 deletion examples/vhost_ip_based.pp
Expand Up @@ -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,
}

Expand Down
2 changes: 1 addition & 1 deletion examples/vhost_proxypass.pp
Expand Up @@ -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':
Expand Down
2 changes: 1 addition & 1 deletion examples/vhost_ssl.pp
Expand Up @@ -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,
}

Expand Down
2 changes: 1 addition & 1 deletion examples/vhosts_without_listen.pp
Expand Up @@ -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,
}

Expand Down
2 changes: 1 addition & 1 deletion manifests/fastcgi/server.pp
Expand Up @@ -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]

Expand Down

0 comments on commit 498592d

Please sign in to comment.