more updates

Puppetfile

@@ -6,6 +6,7 @@ forge "https://forgeapi.puppetlabs.com"
 # use dependencies defined in metadata.json
 metadata
 
+
 # use dependencies defined in Modulefile
 # modulefile
 

data/common.yaml

@@ -1,7 +1,4 @@
 ---
-# Java
-rk_tomcat::java::zulu_package: zulu-8
-rk_tomcat::java::zulu_version: 8.20.0.5-1
 
 # Tomcat
 rk_tomcat::tomcat::hosts:

data/hiera.yaml

@@ -1,7 +1,11 @@
+---
 version: 5
+defaults:
+  datadir: .
+  data_hash: yaml_data
 hierarchy:
-  -name: "Other YAML heierarchy levels"
-  paths: 
-    - "secrets.yaml"
-    - "secrets-common.yaml"
-    - "common.yaml"
+  - name: "Other YAML hierarchy levels"
+    paths: # Can specify an array of paths instead of one.
+      - "secrets.yaml"
+      - "secrets-common.yaml"
+      - "common.yaml"

manifests/consul.pp

@@ -9,7 +9,7 @@
   class { '::consul':
     version  => "$version",
     service_enable => true,
-    service_ensure => false,
+    service_ensure => "running",
     config_hash => {
       'data_dir'             => '/opt/consul',
       'datacenter'           => "$datacenter",

manifests/init.pp

@@ -48,7 +48,8 @@
   if ( $mode == 'provision' ) {
     class { 'rk_tomcat::fonts': }
 
-    class { 'rk_tomcat::java':
+    class { 'java':
+      package => 'java-1.8.0-openjdk-devel',
       before => Class[rk_tomcat::tomcat],
     }
   }

manifests/limits.pp

@@ -3,14 +3,12 @@
 class rk_tomcat::limits (
   $nofile,
 ) {
-  # PAM limits
-  ::limits::fragment { 'tomcat-nofile':
-    domain => '*',
-    type   => '-',
-    item   => 'nofile',
-    value  => "$nofile",
-    file   => '/etc/security/limits.d/10-rk_tomcat.conf',
-  } ->
+  limits::limits{'tomcat-nofile':
+    ensure     => present,
+    limit_type => 'nofile',
+    both       => "$nofile",
+    user       => '*',
+  }
 
   # sysctl
   sysctl { 'sys.fs.file-max':

manifests/tomcat.pp

@@ -44,12 +44,13 @@
   }
 
   # install Tomcat package
-  class { '::tomcat':
-    install_from_source => false,
+  tomcat::install { '/usr/share/tomcat7':
+      source_url => 'https://www-us.apache.org/dist/tomcat/tomcat-7/v7.0.109/bin/apache-tomcat-7.0.109.tar.gz',
   } ->
 
-  ::tomcat::instance { $tomcat_instance:
-    package_name => $tomcat_pkg,
+  tomcat::instance { 'default':
+    manage_service  =>  false,
+    catalina_home   => $cataline_home,
   } ->
 
   class { 'rk_tomcat::newrelic::provision': } ->

metadata.json

@@ -10,7 +10,9 @@
   "dependencies": [
     {"name":"puppetlabs-stdlib","version_requirement":">= 4.0.0 < 7.0.0"},
     {"name":"puppetlabs-tomcat","version_requirement":">= 1.3.2"},
-    {"name":"puppetlabs-limits","version_requirement":">= 0.1.0"},
+    {"name":"puppetlabs-host_core","version_requirement":">= 1.0.3"},
+    {"name":"puppetlabs-java","version_requirement":">= 7.0.2"},
+    {"name":"saz-limits","version_requirement":">= 3.0.4"},
     {"name":"maestrodev-wget","version_requirement":">= 1.7.1"},
     {"name":"herculesteam-augeasproviders_sysctl","version_requirement":">= 2.0.2"},
     {"name":"threatstack-threatstack","version_requirement":">= 1.5.4 "},