Pull in some changes from puppet-consul: update download URLs, make a…

…rm arch selector more general

.gitignore

@@ -0,0 +1 @@
+spec/fixtures

manifests/init.pp

@@ -40,36 +40,41 @@
 #   Purge config files no longer generated by Puppet.
 #
 class vault (
-  $backend           = undef,
-  $listener          = undef,
-  $manage_user       = false,
-  $user              = 'root',
-  $manage_group      = false,
-  $group             = 'root',
-  $purge_config_dir  = true,
-  $bin_dir           = '/usr/local/bin',
-  $arch              = $vault::params::arch,
-  $version           = $vault::params::version,
-  $install_method    = $vault::params::install_method,
-  $os                = $vault::params::os,
-  $download_url      = "https://dl.bintray.com/mitchellh/vault/vault_${version}_${os}_${arch}.zip",
-  $package_name      = $vault::params::package_name,
-  $package_ensure    = $vault::params::package_ensure,
-  $config_dir        = '/etc/vault',
-  $extra_options     = [],
-  $config_hash       = {},
-  $config_defaults   = {},
-  $service_enable    = true,
-  $service_ensure    = 'running',
-  $manage_service    = true,
-  $init_style        = $vault::params::init_style,
+  $backend            = undef,
+  $listener           = undef,
+  $manage_user        = false,
+  $user               = 'root',
+  $manage_group       = false,
+  $group              = 'root',
+  $purge_config_dir   = true,
+  $bin_dir            = '/usr/local/bin',
+  $arch               = $vault::params::arch,
+  $version            = $vault::params::version,
+  $install_method     = $vault::params::install_method,
+  $os                 = $vault::params::os,
+  $download_url       = undef,
+  $download_url_base  = $vault::params::download_url_base,
+  $download_extension = $vault::params::download_extension,
+  $package_name       = $vault::params::package_name,
+  $package_ensure     = $vault::params::package_ensure,
+  $config_dir         = '/etc/vault',
+  $extra_options      = [],
+  $config_hash        = {},
+  $config_defaults    = {},
+  $service_enable     = true,
+  $service_ensure     = 'running',
+  $manage_service     = true,
+  $init_style         = $vault::params::init_style,
 ) inherits vault::params {
 
+  $real_download_url    = pick($download_url, "${download_url_base}${version}/${package_name}_${version}_${os}_${arch}.${download_extension}")
+
   # with no arguments, we simply install vault.
   anchor {'vault_first': } ->
   class { 'vault::install': } ->
   anchor {'vault_last': }
 
+
   # but if $backend is set, assume we want to run the service.
   if $backend {
     validate_bool($purge_config_dir)

manifests/install.pp

@@ -1,6 +1,6 @@
 # == Class vault::intall
 #
-# Installs vault based in the parameters from init
+# Installs vault based on the parameters from init
 #
 class vault::install {
 
@@ -19,7 +19,7 @@
       ensure_packages(['unzip'])
     }
     staging::file { 'vault.zip':
-      source => $vault::download_url
+      source => $vault::real_download_url,
     } ->
     staging::extract { 'vault.zip':
       target  => $vault::bin_dir,
@@ -30,25 +30,6 @@
       group => 0, # 0 instead of root because OS X uses "wheel".
       mode  => '0555',
     }
-
-    if ($vault::ui_dir and $vault::data_dir) {
-      file { "${vault::data_dir}/${vault::version}_web_ui":
-        ensure => 'directory',
-        owner  => 'root',
-        group  => 0, # 0 instead of root because OS X uses "wheel".
-        mode   => '0755',
-      } ->
-      staging::deploy { 'vault_web_ui.zip':
-        source  => $vault::ui_download_url,
-        target  => "${vault::data_dir}/${vault::version}_web_ui",
-        creates => "${vault::data_dir}/${vault::version}_web_ui/dist",
-      }
-      file { $vault::ui_dir:
-        ensure => 'symlink',
-        target => "${vault::data_dir}/${vault::version}_web_ui/dist",
-      }
-    }
-
   } elsif $vault::install_method == 'package' {
 
     package { $vault::package_name:

manifests/params.pp

@@ -5,15 +5,17 @@
 #
 class vault::params {
 
-  $install_method    = 'url'
-  $package_name      = 'vault'
-  $package_ensure    = 'latest'
-  $version = '0.1.2'
+  $install_method        = 'url'
+  $package_name          = 'vault'
+  $package_ensure        = 'latest'
+  $version               = '0.1.2'
+  $download_url_base     = 'https://releases.hashicorp.com/consul/'
+  $download_extension    = 'zip'
 
   case $::architecture {
     'x86_64', 'amd64': { $arch = 'amd64' }
     'i386':            { $arch = '386'   }
-    'armv7l':          { $arch = 'arm' }
+    /^arm.*/:          { $arch = 'arm'   }
     default:           {
       fail("Unsupported kernel architecture: ${::architecture}")
     }