Simplify installation without staging module and prepare for toml API changes in InfluxDB 0.9

.fixtures.yml

@@ -2,6 +2,5 @@
 fixtures:
   repositories:
     inifile: https://github.com/puppetlabs/puppetlabs-inifile
-    staging: https://github.com/nanliu/puppet-staging
   symlinks:
     influxdb: "#{source_dir}"

.gitignore

@@ -1,3 +1,5 @@
+DEADJOE
+*~
 Gemfile.lock
 *.swp
 .librarian/

.travis.yml

@@ -1,19 +1,36 @@
----
 branches:
   only:
     - master
+    - repo-handling
 language: ruby
 rvm:
+  - 1.9.3
   - 2.0.0
+  - 2.1.0
+cache: bundler
+sudo: false
 bundler_args: --without development
-script: bundle exec rake spec SPEC_OPTS='--format documentation'
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
 env:
-  matrix:
-    - PUPPET_VERSION="2.7.25"
-    - PUPPET_VERSION="3.1.1"
-    - PUPPET_VERSION="3.2.4"
-    - PUPPET_VERSION="3.3.2"
-    - PUPPET_VERSION="3.4.2"
+  - PUPPET_VERSION="~> 2.7.0"
+  - PUPPET_VERSION="~> 3.4.0"
+  - PUPPET_VERSION="~> 3.5.0"
+  - PUPPET_VERSION="~> 3.6.0"
+  - PUPPET_VERSION="~> 3.7.0"
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      env: PUPPET_VERSION="~> 2.7.0"
+    - rvm: 2.0.0
+      env: PUPPET_VERSION="~> 2.7.0"
+    - rvm: 2.0.0
+      env: PUPPET_VERSION="~> 3.0.0"
+    - rvm: 2.0.0
+      env: PUPPET_VERSION="~> 3.1.0"
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 3.3.0"
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 3.4.0"
 notifications:
   email:
-    - justin@downing.us
+    - roman@plessl.info

LICENSE

@@ -1,4 +1,7 @@
+The MIT License (MIT)
+
 Copyright (c) 2014 Justin Downing
+Copyright (c) 2014-2015 Roman Plessl
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

Puppetfile

@@ -1,4 +1,3 @@
-forge 'http://forge.puppetlabs.com'
+forge 'https://forgeapi.puppetlabs.com'
 
-mod 'nanliu/staging', '>= 0.4.0'
 mod 'puppetlabs/inifile', '>= 1.0.0'

Puppetfile.lock

@@ -1,10 +1,8 @@
 FORGE
-  remote: http://forge.puppetlabs.com
+  remote: https://forgeapi.puppetlabs.com
   specs:
-    nanliu/staging (0.4.0)
-    puppetlabs/inifile (1.0.3)
+    puppetlabs-inifile (1.2.0)
 
 DEPENDENCIES
-  nanliu/staging (>= 0.4.0)
-  puppetlabs/inifile (>= 1.0.0)
+  puppetlabs-inifile (>= 1.0.0)
 

README.md

@@ -1,27 +1,69 @@
-# influxdb
+# puppet-influxdb
 
-[![Puppet Forge](http://img.shields.io/puppetforge/v/jdowning/influxdb.svg)](https://forge.puppetlabs.com/jdowning/influxdb) [![Build Status](https://travis-ci.org/justindowning/puppet-influxdb.png)](https://travis-ci.org/justindowning/puppet-influxdb)
+[![Build Status](https://travis-ci.org/rplessl/puppet-influxdb.png)](https://travis-ci.org/rplessl/puppet-influxdb)
 
 ## Description
 
-This Puppet module will install [influxdb](https://influxdb.org) on Debian or RedHat.
-
-This module is still under active development so things are likely to change. If
-you have any ideas or contributions, feel free to open a pull request!
+puppet module to install and configure [influxdb](https://influxdb.org) (version 0.9.x and newer). Tested with InfluxDB 0.9.1 and 0.9.2.
 
 ## Installation
 
-`puppet module install --modulepath /path/to/puppet/modules jdowning-influxdb`
+`puppet module install --modulepath /path/to/puppet/modules puppet-influxdb`
 
 ## Usage
 
+Basic default uses local package
+
 `class { 'influxdb': }`
 
-Most of the configuration is parameterized, so you can freely adjust settings.
+Install the influx packages from InfluxDB upstream Amazon s3 packages. This is the default when not using a self managed repository
+```
+    class { 'influxdb':
+        install_from_repository => false,
+    }
+```
+Alternativly you can install packages using your own url/proxy
+```
+    class { 'influxdb':
+        install_from_repository => false,
+        download_url              => 'https://download.test.com/proxy/influxdb/influxdb-1.0.0.rpm'
+    }
+```
+
+
+These configuration parameter can be set:
+```
+  $ensure                         = 'installed'
+  $version                        = 'latest'
+  $install_from_repository        = true
+  $download_url                   = undef or https://download.test.com/influxdb.deb
+  $config_file                    = '/etc/opt/influxdb/influxdb.conf'
+
+  # general section of influxb.conf
+  $reporting_disabled             = false
+
+  # [meta]
+  $meta_hostname                  = "localhost" or "192.168.0.1"
+  $meta_peers                     = undef       or ["192.168.0.1:8088", "192.168.0.2:8088", "192.168.0.3:8088"]
+
+  # [retention]
+  $retention_replication          = undef       or 3
+```
 
 ## Testing
 
+Install and setup vagrant [https://docs.vagrantup.com/v2/installation/index.html](as described here).
+
+Fetch virtual machines:
+```ShellSession
+vagrant box add puppetlabs/ubuntu-14.04-64-puppet --insecure
+vagrant box add puppetlabs/centos-6.6-64-puppet   --insecure
+vagrant box add puppetlabs/centos-7.0-64-puppet   --insecure
+vagrant box add puppetlabs/debian-7.8-64-puppet   --insecure
 ```
+
+Add vagrant puppet support and run tests:
+```ShellSession
 bundle install
 bundle exec librarian-puppet install
 vagrant up

Rakefile

@@ -1,9 +1,9 @@
 require 'bundler'
 Bundler.require(:rake)
 
+require 'rubygems'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
-require 'puppet_blacksmith/rake_tasks'
 
 Rake::Task[:lint].clear
 PuppetLint::RakeTask.new :lint do |config|

Vagrantfile

@@ -1,26 +1,60 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-Vagrant.configure("2") do |config|
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.hostname = 'puppet-influxdb'
-  config.vm.synced_folder "modules", "/tmp/puppet-modules", type: "rsync", rsync__exclude: ".git/"
-  config.vm.synced_folder ".", "/tmp/puppet-modules/influxdb", type: "rsync", rsync__exclude: ".git/"
 
-  config.vm.define "centos", primary: true do |centos|
-    centos.vm.box = "puppetlabs/centos-6.5-64-puppet"
-    centos.vm.provision :puppet do |puppet|
+  config.vm.box_download_insecure = true
+
+  config.vm.synced_folder "modules", "/tmp/puppet-modules",          type: "rsync", rsync__exclude: ".git/"
+  config.vm.synced_folder ".",       "/tmp/puppet-modules/influxdb", type: "rsync", rsync__exclude: ".git/"
+
+  config.vm.define "ubuntu", primary: true do |ubuntu|
+    ubuntu.vm.box = "puppetlabs/ubuntu-14.04-64-puppet"
+    ubuntu.vm.provision :puppet do |puppet|
       puppet.manifests_path = "tests"
       puppet.manifest_file  = "vagrant.pp"
       puppet.options        = ["--modulepath", "/tmp/puppet-modules"]
     end
   end
 
-  config.vm.define "ubuntu", autostart: false do |ubuntu|
-    ubuntu.vm.box = "puppetlabs/ubuntu-14.04-64-puppet"
-    ubuntu.vm.provision :puppet do |puppet|
+  config.vm.define "debian6", autostart: false do |debian6|
+    debian6.vm.box = "puppetlabs/debian-6.0.10-64-puppet"
+    debian6.vm.provision :puppet do |puppet|
+      puppet.manifests_path = "tests"
+      puppet.manifest_file  = "vagrant.pp"
+      puppet.options        = ["--modulepath", "/tmp/puppet-modules"]
+    end
+  end
+
+  config.vm.define "debian", autostart: false do |debian|
+    debian.vm.box = "puppetlabs/debian-7.8-64-puppet"
+    debian.vm.provision :puppet do |puppet|
       puppet.manifests_path = "tests"
       puppet.manifest_file  = "vagrant.pp"
       puppet.options        = ["--modulepath", "/tmp/puppet-modules"]
     end
   end
+
+  config.vm.define "centos6", autostart: false do |centos6|
+    centos6.vm.box = "puppetlabs/centos-6.6-64-puppet"
+    centos6.vm.provision :puppet do |puppet|
+      puppet.manifests_path = "tests"
+      puppet.manifest_file  = "vagrant.pp"
+      puppet.options        = ["--modulepath", "/tmp/puppet-modules"]
+    end
+  end
+
+  config.vm.define "centos7", autostart: false do |centos7|
+    centos7.vm.box = "puppetlabs/centos-7.0-64-puppet"
+    centos7.vm.provision :puppet do |puppet|
+      puppet.manifests_path = "tests"
+      puppet.manifest_file  = "vagrant.pp"
+      puppet.options        = ["--modulepath", "/tmp/puppet-modules"]
+    end
+  end
+
 end