Merge pull request #33 from bstopp/bug/unpack-order

bstopp · bstopp · commit 001048960443 · 2015-09-24T09:24:36.000-05:00
Bug/unpack order
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,12 @@
-
+*.iml
+.project
+.buildpath
+.vagrant/
+.bundle/
+.idea/
 pkg/
 vendor/
 spec/fixtures/
-.vagrant/
-.bundle/
 coverage/
-.idea/
-*.iml
-.project
-.buildpath
 log/
 junit/
diff --git a/files/.gitignore b/files/.gitignore
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -1,6 +1,6 @@
 # == Class: aem::config
 #
-# Configure the AEM instance with the appropriate parameter values, ensuring
+# Configure the AEM instance with the appropriate parameter values
 #
 # Do not use this class directly.
 #
@@ -41,8 +41,8 @@
   # Create the start script
   file { "${home}/crx-quickstart/bin/start":
     ensure  => file,
+    content => template("${module_name}/start.erb"),
     mode    => '0755',
-    source  => "puppet:///modules/${module_name}/start",
     require => File["${home}/crx-quickstart/bin/start.orig"],
   }
 
diff --git a/spec/acceptance/acceptance_spec.rb b/spec/acceptance/acceptance_spec.rb
@@ -28,12 +28,6 @@
     mode          => \"0755\",
   }
 
-  file { \"/opt/faux/crx-quickstart/bin/start\" :
-    ensure        => \"file\",
-    source       => "puppet:///modules/aem/start",
-    mode          => \"0755\",
-  }
-
   file { \"/opt/faux/crx-quickstart/bin/start.orig\" :
     ensure        => \"file\",
     content       => \"\",
diff --git a/spec/defines/aem_instance_spec.rb b/spec/defines/aem_instance_spec.rb
@@ -148,8 +148,8 @@
         '/opt/aem/crx-quickstart/bin/start'
       ).with(
         'ensure'      => 'file',
+        'content'     => /.*/,
         'group'       => 'aem',
-        'source'      => 'puppet:///modules/aem/start',
         'owner'       => 'aem'
       ).that_requires(
         'File[/opt/aem/crx-quickstart/bin/start.orig]'
diff --git a/templates/start.erb b/templates/start.erb

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# == Class: aem::config`
`2`	`2`	`#`
`3`		`-# Configure the AEM instance with the appropriate parameter values, ensuring`
	`3`	`+# Configure the AEM instance with the appropriate parameter values`
`4`	`4`	`#`
`5`	`5`	`# Do not use this class directly.`
`6`	`6`	`#`
`@@ -41,8 +41,8 @@`
`41`	`41`	`# Create the start script`
`42`	`42`	`file { "${home}/crx-quickstart/bin/start":`
`43`	`43`	`ensure => file,`
	`44`	`+ content => template("${module_name}/start.erb"),`
`44`	`45`	`mode => '0755',`
`45`		`- source => "puppet:///modules/${module_name}/start",`
`46`	`46`	`require => File["${home}/crx-quickstart/bin/start.orig"],`
`47`	`47`	`}`
`48`	`48`