Merge pull request #1 from loomsen/test_travis

Fix travis checks

.gitignore

@@ -2,3 +2,4 @@
 Gemfile.lock
 pkg/
 vendor/
+log/

.travis.yml

@@ -2,13 +2,19 @@
 sudo: false
 language: ruby
 cache: bundler
-bundler_args: --without system_tests
-script: "bundle exec rake validate && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
   include:
-    rvm: 2.1
+  - rvm: 2.3
     env: PUPPET_GEM_VERSION="~> 4.0"
+    script: "bundle exec rake validate"
+  - rvm: 2.3
+    env: PUPPET_GEM_VERSION="~> 4.0"
+    script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
+  - rvm: 2.3
+    env: PUPPET_GEM_VERSION="~> 4.0"
+    script: "bundle exec rake beaker"
+    services: docker
+    sudo: required
 notifications:
   email: false
-

Gemfile

@@ -6,3 +6,9 @@ gem 'puppetlabs_spec_helper', '>= 0.8.2'
 gem 'puppet-lint', '>= 1.0.0'
 gem 'facter', '>= 1.7.0'
 gem 'metadata-json-lint'
+
+group :acceptance do
+  gem 'beaker-rspec', '5.6.0'
+  gem 'serverspec',   require: false
+  gem 'specinfra',    require: false
+end

README.md

@@ -329,7 +329,7 @@ Default is:
     monthly    => {
       minute   => '0..59',
       hour     => '0..23',      # you could also do:   ['21..23','0..4','5'],
-      monthday => '0..28',
+      monthday => '1..28',
       month    => '*',
       weekday  => '*',
     },

manifests/config.pp

@@ -190,6 +190,8 @@ class rsnapshot::config (
     # create cron files for each backup level
     # merge possible cron definitions to one
     $real_cron = deep_merge($rsnapshot::params::cron, $rsnapshot::cron, $hash[cron])
+    $cmd_rsnapshot = pick($rsnapshot::cmd_rsnapshot, $rsnapshot::params::config_cmd_rsnapshot)
+
     concat::fragment { "mailto for ${host}":
       content => "#This file is managed by puppet\nMAILTO=${real_cron[mailto]}\n\n",
       target  => $cronfile,

manifests/install.pp

@@ -10,5 +10,18 @@ class rsnapshot::install {
     ensure => $rsnapshot::package_ensure,
   }
 
+  # ensure run directory exists (systemd clears /var/run, so rsnapshot can't create PID files after reboot - issue#12)
+  $lockpath   = pick($rsnapshot::lockpath, $rsnapshot::params::config_lockpath, '/var/run/rsnapshot')
+  $tmpfiles_d = '/etc/tmpfiles.d'
+ 
+  file { "${tmpfiles_d}":
+    ensure => directory,
+  }
+
+  file { "${tmpfiles_d}/rsnapshot.conf":
+    ensure  => present,
+    content => "D ${lockpath} 0755 root root -",
+  }
+
 }
 

manifests/params.pp

@@ -3,13 +3,17 @@
 # default params
 class rsnapshot::params {
   $hosts                         = undef
-  $conf_d                        = '/etc/rsnapshot' # the place where the host specific configs are stored
+  $conf_d                        = $::osfamily ? {
+    'FreeBSD' => '/usr/local/etc/rsnapshot', # the place where the host specific configs are stored
+    default   => '/etc/rsnapshot,' # the place where the host specific configs are stored
+    }
   $config_backup_user            = 'root'
   $package_name                  = 'rsnapshot'
   $package_ensure                = 'present'
   $cron_service_name             = $::osfamily ? {
     'RedHat'  => 'crond',
     'Debian'  => 'cron',
+    'FreeBSD' => 'cron',
     default   => '',
     }
   $manage_cron                   = true
@@ -20,11 +24,21 @@ class rsnapshot::params {
   $config_check_mk_job           = false
   $config_cmd_cp                 = '/bin/cp'
   $config_cmd_rm                 = '/bin/rm'
-  $config_cmd_rsync              = '/usr/bin/rsync'
+  $config_cmd_rsync              = $::osfamily ? {
+    'FreeBSD' => '/usr/local/bin/rsync',
+    default   => '/usr/bin/rsync',
+    }
   $config_cmd_ssh                = '/usr/bin/ssh'
   $config_cmd_logger             = '/usr/bin/logger'
   $config_cmd_du                 = '/usr/bin/du'
-  $config_cmd_rsnapshot_diff     = '/usr/bin/rsnapshot-diff'
+  $config_cmd_rsnapshot          = $::osfamily ? {
+    'FreeBSD' => '/usr/local/bin/rsnapshot',
+    default   => '/usr/bin/rsnapshot',
+    }
+  $config_cmd_rsnapshot_diff     = $::osfamily ? {
+    'FreeBSD' => '/usr/local/bin/rsnapshot-diff',
+    default   => '/usr/bin/rsnapshot-diff',
+    }
   $config_cmd_preexec            = undef
   $config_cmd_postexec           = undef
   $config_cronfile_prefix        = 'rsnapshot_'
@@ -96,7 +110,7 @@ class rsnapshot::params {
     monthly    => {
       minute   => '0..59',
       hour     => '0..23',      # you could also do:   ['21..23','0..4','5'],
-      monthday => '0..28',
+      monthday => '1..28',
       month    => '*',
       weekday  => '*',
     },

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "loomsen-rsnapshot",
-  "version": "1.2.1",
+  "version": "1.2.4",
   "author": "loomsen",
   "summary": "Configures rsnapshot.",
   "license": "Apache-2.0",
@@ -15,7 +15,7 @@
   "dependencies": [
     { "name": "puppetlabs-stdlib","version_requirement": ">= 1.0.0" },
     { "name": "stahnma-epel","version_requirement": ">= 1.0.0" },
-    { "name": "puppetlabs-concat","version_requirement": ">= 2.0.0 < 3.0.0" }
+    { "name": "puppetlabs-concat","version_requirement": ">= 2.0.0" }
   ],
   "operatingsystem_support": [
     {
@@ -28,11 +28,11 @@
     },
     {
     "operatingsystem": "Ubuntu",
-    "operatingsystemrelease": [ "12.04", "10.04", "14.04" ]
+    "operatingsystemrelease": [ "12.04", "12.10", "13.04", "13.10", "14.04", "14.10", "15.04", "15.10", "16.04", "16.10", "17.04" ]
     },
     {
     "operatingsystem": "Fedora",
-    "operatingsystemrelease": [ "17", "18", "19", "20", "21", "22", "23", "24" ]
+    "operatingsystemrelease": [ "17", "18", "19", "20", "21", "22", "23", "24", "25" ]
     }
   ]
 }

spec/acceptance/default_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper_acceptance'
+
+describe 'rsnapshot' do
+  context 'with defaults' do
+    it 'run idempotently' do
+      pp = <<-EOS
+        class { 'rsnapshot':
+         hosts => {
+         'localhost' => {},
+         'example.com'    => {
+           backup_defaults => false,
+           backup          => {
+            '/var/'       => './'
+           }
+          }
+         }
+        }
+      EOS
+
+      apply_manifest(pp, catch_failures: true)
+      apply_manifest(pp, catch_changes: true)
+    end
+  end
+
+  context 'packages installed' do
+    describe package('rsnapshot') do
+      it { is_expected.to be_installed }
+    end
+  end
+  context 'files provisioned' do
+    describe file('/etc/tmpfiles.d') do
+      it { should be_directory }
+    end
+    describe file('/etc/tmpfiles.d/rsnapshot.conf') do
+      it { is_expected.to exist }
+      its(:content) { is_expected.to match 'D /var/run/rsnapshot 0755 root root -' }
+    end
+    describe file('/var/run/rsnapshot') do
+      it { should be_directory }
+    end
+    describe file('/etc/rsnapshot/localhost.rsnapshot.conf') do
+      it { is_expected.to exist }
+      its(:content) { is_expected.to match 'backup' }
+    end
+    describe file('/etc/rsnapshot/example.com.rsnapshot.conf') do
+      it { is_expected.to exist }
+      its(:content) { is_expected.to match 'backup\troot@example.com:/var/\t./' }
+    end
+    describe file('/etc/rsnapshot.conf') do
+      it { is_expected.to exist }
+      its(:content) { is_expected.to match 'localhost' }
+      its(:content) { is_expected.to match 'example.com' }
+    end
+    describe file('/etc/rsnapshot/localhost.rsnapshot.conf') do
+      it { is_expected.to exist }
+      its(:content) { is_expected.to match 'backup' }
+    end
+      describe file('/etc/cron.d/example_com') do
+      it { is_expected.to exist }
+      its(:content) { is_expected.to match 'example.com' }
+    end
+  end
+end

spec/acceptance/nodesets/default.yml

@@ -0,0 +1,15 @@
+HOSTS:
+  debian-8-x64:
+    platform: debian-8-amd64
+    hypervisor: docker
+    image: debian:8
+    docker_container_name: puppet_rsnapshot
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'echo deb http://ftp.debian.org/debian jessie-backports main >> /etc/apt/sources.list'
+      - 'apt-get update && apt-get install -y cron locales-all net-tools wget'
+      - 'rm -f /usr/sbin/policy-rc.d'
+CONFIG:
+  trace_limit: 200
+  masterless: true

spec/spec_helper_acceptance.rb

@@ -0,0 +1,26 @@
+require 'puppet'
+require 'beaker-rspec'
+require 'yaml'
+
+install_puppet_agent_on hosts, {}
+
+RSpec.configure do |c|
+  # Module root and settings
+  module_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  module_name = module_root.split('/').last.sub('-', '_').split('_').last()
+
+  c.formatter = :documentation
+  c.max_displayed_failure_line_count = 5
+
+  c.before :suite do
+    puts 'Install module'
+    puppet_module_install(source: module_root, module_name: module_name)
+
+    hosts.each do |host|
+      puts 'Install fixtures'
+       on host, puppet('module','install','stahnma/epel')
+       on host, puppet('module','install','puppetlabs/stdlib')
+       on host, puppet('module','install','puppetlabs/concat')
+    end
+  end
+end

templates/cron.erb

@@ -1 +1 @@
-<%= @minute %> <%= @hour %> <%= @monthday %> <%= @month %> <%= @weekday %>  root<% if scope['rsnapshot::check_mk_job'] == true -%> mk-job rsnapshot_<%= @host %>_<%= @level %><% end -%>       /usr/bin/rsnapshot -c <%= @config %> <%= @level %>
+<%= @minute %> <%= @hour %> <%= @monthday %> <%= @month %> <%= @weekday %>  root<% if scope['rsnapshot::check_mk_job'] == true -%> mk-job rsnapshot_<%= @host %>_<%= @level %><% end -%>       <%= @cmd_rsnapshot %> -c <%= @config %> <%= @level %>