diff --git a/manifests/apache.pp b/manifests/apache.pp index 5df8fe1..560dcb6 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -31,7 +31,7 @@ class ethercalc::apache ( ensure => present, } - include ::httpd + include httpd ::httpd::vhost { $vhost_name: port => 443, docroot => $docroot, diff --git a/manifests/init.pp b/manifests/init.pp index 933a765..a6f605a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -14,7 +14,7 @@ class ethercalc ( $base_install_dir = '/opt/ethercalc', $base_log_dir = '/var/log', $ethercalc_user = 'ethercalc', - $ethercalc_version= '0.20161220.1', + $ethercalc_version= '0.20200505.0', # If set to system will install system package, otherwise # we try to choose one based on the host platform $nodejs_version = undef, @@ -83,7 +83,7 @@ class ethercalc ( anchor { 'nodejs-package-install': } if ($use_nodejs_version != 'system') { - class { '::nodejs': + class { 'nodejs': repo_url_suffix => $use_nodejs_version, legacy_debian_symlinks => false, before => Anchor['nodejs-package-install'], @@ -139,7 +139,7 @@ class ethercalc ( require => File['/etc/init/ethercalc.conf'], } - include ::logrotate + include logrotate logrotate::file { 'ethercalc_error': log => "${base_log_dir}/${ethercalc_user}/error.log", options => [ diff --git a/manifests/redis.pp b/manifests/redis.pp index fadde50..88def96 100644 --- a/manifests/redis.pp +++ b/manifests/redis.pp @@ -7,7 +7,7 @@ class ethercalc::redis( $redis_password = undef, $redis_version = '2.8.4', ) { - class { '::redis': + class { 'redis': redis_port => $redis_port, redis_max_memory => $redis_max_memory, redis_bind => $redis_bind,