From bb242ec207a4874a438a5c3bc9db5c44dc41866e Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Sat, 25 Jul 2020 14:15:38 +0200
Subject: [PATCH 1/2] modulesync 3.0.0

---
 .github/SECURITY.md | 3 +++
 .msync.yml          | 2 +-
 .rubocop.yml        | 3 +++
 .travis.yml         | 5 +++--
 Gemfile             | 6 +++---
 5 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 .github/SECURITY.md

diff --git a/.github/SECURITY.md b/.github/SECURITY.md
new file mode 100644
index 0000000..cacadf2
--- /dev/null
+++ b/.github/SECURITY.md
@@ -0,0 +1,3 @@
+# Vox Pupuli Security Policy
+
+Our vulnerabilities reporting process is at https://voxpupuli.org/security/
diff --git a/.msync.yml b/.msync.yml
index 8864fc0..4c7999c 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '2.12.0'
+modulesync_config_version: '3.0.0'
diff --git a/.rubocop.yml b/.rubocop.yml
index c2ebc88..316e4ec 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -528,6 +528,9 @@ RSpec/RepeatedDescription:
 RSpec/NestedGroups:
   Enabled: False
 
+RSpec/MultipleExpectations:
+  Enabled: false
+
 # this is broken on ruby1.9
 Layout/IndentHeredoc:
   Enabled: False
diff --git a/.travis.yml b/.travis.yml
index d8f1e28..e70fa6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 ---
+os: linux
 dist: bionic
 language: ruby
 cache: bundler
@@ -7,7 +8,7 @@ before_install:
   - bundle --version
 script:
   - 'bundle exec rake $CHECK'
-matrix:
+jobs:
   fast_finish: true
   include:
   - rvm: 2.4.4
@@ -36,7 +37,7 @@ notifications:
       - "chat.freenode.org#voxpupuli-notifications"
 deploy:
   provider: puppetforge
-  user: puppet
+  username: puppet
   password:
     secure: ""
   on:
diff --git a/Gemfile b/Gemfile
index a066256..dc5e237 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,9 +11,9 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
-  gem 'voxpupuli-test', '>= 1.0.0',  :require => false
-  gem 'coveralls',                   :require => false
-  gem 'simplecov-console',           :require => false
+  gem 'voxpupuli-test', '~> 2.0',  :require => false
+  gem 'coveralls',                 :require => false
+  gem 'simplecov-console',         :require => false
 end
 
 group :development do

From 71341ed668f9df4d3f3c16d01a1a2e181c794781 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Sat, 25 Jul 2020 18:50:07 +0200
Subject: [PATCH 2/2] add travis secret

---
 .sync.yml   | 2 ++
 .travis.yml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.sync.yml b/.sync.yml
index fc43554..10b9839 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -11,3 +11,5 @@ spec/spec_helper.rb:
 .rubocop.yml:
   cops:
     Security/MarshalLoad: false
+.travis.yml:
+  secure: "rIqlHIjLtJOQiJ5LX8qPje8PFBcu52Vv5GEpioxp+jf7/BQVGkMik1bVIkkorI5CDsmjJJqfZwuuMK3JoHKnlI8jNtSQlA/lrszRJm2fhCBXZAQwQz2n8azaszH/ysNsBJ56zZj/DlT+S7uR9gVLYiuHsTjgCLDQEfc1Y0yn6UbU04sGIuXmwCqF+E7vtGVyJW+PsdqakQawbb/jK8F0ah9cw3yj4CTQpMVIP/JwYubZ+ACXvrxWh8+/U8T7s8GE0+X8gcGRK1DB06iov09Mo78gHwx4jaedwFz/HUKyKZqfSqYNC4OA2/fPJsPOdje74Fb/IvDPLamEkgLcltjZsjdyq2mRlLej2WKhQb5wCEKFPDJAi18GcVOyayp9YDF0F6q1EfUhfJlJUj3eUJVO62dNujcFb6GM401qnWr3QD07V2PaHVQjGIO+FUykV+8s6x7qeBNxXQ2IBh1+n7iYBbIzibvMI3E0pLEThToWp+bheqHgjLSqZ6n/kttzPuBQHZCEgX2hAHH1g8IkEDgAYzV1exdqaICgCoj0IAnqhAOVDV1g9IZpxPc3UlP2oTLaY47W64F6sIKbBo/f7+wimnt/9bagzFI7uED+cOCF1IFglCQkl21kzTcrTIdztTyVkNicJtII/fKNuMKlZu4B5WATb+eZrFiiyyA09fwh+XU="
diff --git a/.travis.yml b/.travis.yml
index e70fa6b..3edd48c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ deploy:
   provider: puppetforge
   username: puppet
   password:
-    secure: ""
+    secure: "rIqlHIjLtJOQiJ5LX8qPje8PFBcu52Vv5GEpioxp+jf7/BQVGkMik1bVIkkorI5CDsmjJJqfZwuuMK3JoHKnlI8jNtSQlA/lrszRJm2fhCBXZAQwQz2n8azaszH/ysNsBJ56zZj/DlT+S7uR9gVLYiuHsTjgCLDQEfc1Y0yn6UbU04sGIuXmwCqF+E7vtGVyJW+PsdqakQawbb/jK8F0ah9cw3yj4CTQpMVIP/JwYubZ+ACXvrxWh8+/U8T7s8GE0+X8gcGRK1DB06iov09Mo78gHwx4jaedwFz/HUKyKZqfSqYNC4OA2/fPJsPOdje74Fb/IvDPLamEkgLcltjZsjdyq2mRlLej2WKhQb5wCEKFPDJAi18GcVOyayp9YDF0F6q1EfUhfJlJUj3eUJVO62dNujcFb6GM401qnWr3QD07V2PaHVQjGIO+FUykV+8s6x7qeBNxXQ2IBh1+n7iYBbIzibvMI3E0pLEThToWp+bheqHgjLSqZ6n/kttzPuBQHZCEgX2hAHH1g8IkEDgAYzV1exdqaICgCoj0IAnqhAOVDV1g9IZpxPc3UlP2oTLaY47W64F6sIKbBo/f7+wimnt/9bagzFI7uED+cOCF1IFglCQkl21kzTcrTIdztTyVkNicJtII/fKNuMKlZu4B5WATb+eZrFiiyyA09fwh+XU="
   on:
     tags: true
     # all_branches is required to use tags