Merge branch 'fix_url'

Gemfile

@@ -8,6 +8,6 @@ gem 'rspec-puppet',             :require => false
 gem 'rspec-puppet-facts',       :require => false
 gem 'rake',                     :require => false
 # beaker related gems
-gem 'beaker-rspec',             :require => false
+gem 'beaker-rspec', '5.6.0'
 gem 'serverspec',               :require => false
 gem 'specinfra',                :require => false

data/common.yaml

@@ -1,7 +1,7 @@
 ---
 limesurvey::dbhost: 'localhost'
 limesurvey::download_url: 'https://github.com/LimeSurvey/LimeSurvey/archive/'
-limesurvey::version: '2.51.4_160908'
+limesurvey::version: '2.57.0+161202'
 limesurvey::install_path: '/opt/limesurvey'
 limesurvey::manage_database: true
 limesurvey::manage_webserver: true

manifests/extract.pp

@@ -52,29 +52,20 @@ class limesurvey::extract (
     path    => '/bin:/usr/bin',
     cwd     => '/tmp',
     creates => "${install_path}/tmp/runtime",
-    command => "bash -c 'cd /tmp; tar zxf /tmp/${version}.tar.gz'",
+    command => "bash -c 'cd /tmp; tar zxf /tmp/${version}.tar.gz -C ${install_path} --strip-components=1'",
     require => Exec['limesurvey-download'],
     user    => $www_user,
   }
 
-  exec { 'limesurvey-copy':
-    path    => '/bin:/usr/bin',
-    cwd     => '/tmp',
-    creates => "${install_path}/tmp/runtime",
-    command => "bash -c 'cp -rf /tmp/LimeSurvey-${version}/* ${install_path}'",
-    require => Exec['limesurvey-unzip'],
-    user    => $www_user,
-  }
-
   file { "/tmp/${version}.tar.gz":
     ensure  => absent,
-    require => Exec['limesurvey-copy'],
+    require => Exec['limesurvey-unzip'],
   }
 
   file { "${install_path}/tmp/runtime/":
     ensure  => directory,
     mode    => $runtime_dir_mode,
-    require => Exec['limesurvey-copy'],
+    require => Exec['limesurvey-unzip'],
   }
 
 }