From 1609bb6a445f393715015a142601c58600a34dfc Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 5 Mar 2020 09:14:07 -0800 Subject: [PATCH] Fix leading :: on class includes to make linter happy Why this needed to be a linter rule I do not know. Change-Id: I27ba74c6060c9d2ad09b52bc38090ff9c1f83721 --- manifests/dev.pp | 2 +- manifests/init.pp | 2 +- manifests/logrotate.pp | 2 +- manifests/mod/python.pp | 2 +- manifests/mod/wsgi.pp | 2 +- manifests/php.pp | 2 +- manifests/python.pp | 4 ++-- manifests/ssl.pp | 2 +- manifests/vhost.pp | 4 ++-- manifests/vhost/proxy.pp | 4 ++-- manifests/vhost/redirect.pp | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/manifests/dev.pp b/manifests/dev.pp index ddc6034..9bc18e9 100644 --- a/manifests/dev.pp +++ b/manifests/dev.pp @@ -12,7 +12,7 @@ # Sample Usage: # class httpd::dev { - include ::httpd::params + include httpd::params package { $httpd::params::apache_dev: ensure => installed, diff --git a/manifests/init.pp b/manifests/init.pp index 5f1449d..f2a51dc 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,7 +13,7 @@ # Sample Usage: # class httpd { - include ::httpd::params + include httpd::params package { 'httpd': ensure => installed, diff --git a/manifests/logrotate.pp b/manifests/logrotate.pp index d4356e4..2908497 100644 --- a/manifests/logrotate.pp +++ b/manifests/logrotate.pp @@ -21,7 +21,7 @@ class httpd::logrotate ( " service ${::httpd::params::apache_name} reload > /dev/null; fi; \\", ], ) inherits httpd::params { - include ::logrotate + include logrotate $apache_logdir = "/var/log/${::httpd::params::apache_name}" $logrotate_name = $::httpd::params::apache_name diff --git a/manifests/mod/python.pp b/manifests/mod/python.pp index 2c1e1b2..a7f31f1 100644 --- a/manifests/mod/python.pp +++ b/manifests/mod/python.pp @@ -13,7 +13,7 @@ # Sample Usage: # class httpd::mod::python { - include ::httpd + include httpd package { 'mod_python_package': ensure => installed, diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp index f43641f..8dc2405 100644 --- a/manifests/mod/wsgi.pp +++ b/manifests/mod/wsgi.pp @@ -12,7 +12,7 @@ # Sample Usage: # class httpd::mod::wsgi { - include ::httpd + include httpd package { 'mod_wsgi_package': ensure => installed, diff --git a/manifests/php.pp b/manifests/php.pp index 06bee56..ad86f7f 100644 --- a/manifests/php.pp +++ b/manifests/php.pp @@ -13,7 +13,7 @@ # Sample Usage: # class httpd::php { - include ::httpd::params + include httpd::params package { 'apache_php_package': ensure => present, diff --git a/manifests/python.pp b/manifests/python.pp index c127684..b36d2cb 100644 --- a/manifests/python.pp +++ b/manifests/python.pp @@ -14,8 +14,8 @@ # Sample Usage: # class httpd::python { - include ::httpd::params - include ::httpd + include httpd::params + include httpd package { 'apache_python_package': ensure => present, diff --git a/manifests/ssl.pp b/manifests/ssl.pp index 1a0d607..ace71e3 100644 --- a/manifests/ssl.pp +++ b/manifests/ssl.pp @@ -14,7 +14,7 @@ # class httpd::ssl { - include ::httpd + include httpd case $::operatingsystem { 'centos', 'fedora', 'redhat', 'scientific': { diff --git a/manifests/vhost.pp b/manifests/vhost.pp index 25f30cc..5a1954e 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -47,7 +47,7 @@ define httpd::vhost( $vhost_name = $httpd::params::vhost_name, ) { - include ::httpd + include httpd if $servername == undef { $srvname = $name @@ -56,7 +56,7 @@ define httpd::vhost( } if $ssl == true { - include ::httpd::ssl + include httpd::ssl } # Since the template will use auth, redirect to https requires mod_rewrite diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp index 5c74d52..6a2c3f8 100644 --- a/manifests/vhost/proxy.pp +++ b/manifests/vhost/proxy.pp @@ -31,7 +31,7 @@ define httpd::vhost::proxy ( $vhost_name = '*', ) { - include ::httpd + include httpd $apache_name = $httpd::params::apache_name $ssl_path = $httpd::params::ssl_path @@ -42,7 +42,7 @@ define httpd::vhost::proxy ( } if $ssl == true { - include ::httpd::ssl + include httpd::ssl } # The Apache mod_version module only needs to be enabled on Ubuntu 12.04 diff --git a/manifests/vhost/redirect.pp b/manifests/vhost/redirect.pp index 71eebbb..4184dcd 100644 --- a/manifests/vhost/redirect.pp +++ b/manifests/vhost/redirect.pp @@ -26,7 +26,7 @@ define httpd::vhost::redirect ( $vhost_name = '*' ) { - include ::httpd + include httpd $srvname = $name