Begin to separate out module functionality

manifests/init.pp

@@ -1,12 +1,10 @@
-class artifactory($jdk = "java-1.7.0-openjdk",
-  $sourceforge = "http://downloads.sourceforge.net/project",
-  $version = "3.0.1") {
+class artifactory { #($jdk = "java-1.7.0-openjdk",
+  #$sourceforge = "http://downloads.sourceforge.net/project",
+  #$version = "3.0.1") {
 
-# http://downloads.sourceforge.net/project/artifactory/artifactory/2.5.1.1/artifactory-2.5.1.1.rpm
-
-  if ! defined (Package[$jdk]) {
-    package { $jdk: ensure => installed }
-  }
+  #if ! defined (Package[$jdk]) {
+  #  package { $jdk: ensure => installed }
+  #}
 
   package { 'artifactory':
     ensure => installed,
@@ -15,12 +13,10 @@
     require => Package[$jdk]
   }
 
-  service { 'artifactory':
-    ensure    => 'running',
-    enable => "true",
-    hasstatus => "false",
-    provider => "redhat",
-    require => Package['artifactory'] 
-  }
-
+} inherits artifactory::params {
+  anchor { '::artifactory::start': } ->
+    class { '::artifactory::user': } ->
+    class { '::artifactory::install': } ->
+    class { '::artifactory::service': } ->
+  anchor { '::artifactory::end': }
 }

manifests/install.pp

@@ -0,0 +1,20 @@
+class artifactory::install inherits artifactory {
+  $url = "http://dl.bintray.com/jfrog/artifactory/artifactory-${app_version}.zip"
+
+  if $caller_module_name != $module_name {
+    fail("Use of private class ${name} by ${caller_module_name}")
+  }
+
+  staging::deploy { "artifactory-${app_version}.zip":
+    source  => $url,
+    target  => $app_dir,
+    creates => "$app_dir/artifactory-${app_version}"
+  }
+
+  file { $app_data:
+    ensure => directory,
+    mode   => '0755',
+    owner  => $username,
+    group  => $username
+  }
+}

manifests/params.pp

@@ -0,0 +1,11 @@
+# == Class Artifactory::Params
+# Contains all the parameters for the Artifactory module
+class artifactory::params {
+  $username     = 'artifactory',
+  $pass_hash    = undef,
+  $manage_java  = false,
+  $java_version = '7',
+  $app_dir      = '/opt/artifactory',
+  $app_data     = '/var/artifactory',
+  $app_version  = '3.3.0'
+}

manifests/service.pp

@@ -0,0 +1,11 @@
+class artifactory::server inherits artifactory {
+
+#  service { 'artifactory':
+#    ensure    => 'running',
+#    enable => "true",
+#    hasstatus => "false",
+#    provider => "redhat",
+#    require => Package['artifactory'] 
+#  }
+
+}

manifests/user.pp

@@ -0,0 +1,12 @@
+class artifactory::user inherits artifactory {
+
+  if $caller_module_name != $module_name {
+    fail("Use of private class ${name} by ${caller_module_name}")
+  }
+
+  user { $username:
+    ensure      => present,
+    manage_home => false,
+    password    => $pass_hash
+  }
+}