modulesync 3.0.0

Author: bastelfreak

.github/SECURITY.md

@@ -0,0 +1,3 @@
+# Vox Pupuli Security Policy
+
+Our vulnerabilities reporting process is at https://voxpupuli.org/security/

.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '2.12.0'
+modulesync_config_version: '3.0.0'

.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

.sync.yml

@@ -13,3 +13,5 @@ Gemfile:
       - gem: 'zabbixapi'
 spec/spec_helper.rb:
   mock_with: ':mocha'
+spec/spec_helper_acceptance.rb:
+  unmanaged: false

.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
@@ -68,7 +69,7 @@ notifications:
       - "chat.freenode.org#voxpupuli-notifications"
 deploy:
   provider: puppetforge
-  user: puppet
+  username: puppet
   password:
     secure: "ijm7hKPYWr1eg7151g5oK6MzZL4ojrgWjKlxgoBHXAdXdY88opMgvixfSJK5IMUbtanPfWRkqqABx+MYO78nfQBWDlghUzZ8sQXFeO2Ie0PgWl4nFV0kKWz+ejVaZC4dKSZlWha5pO1ek+sx7KnjIBZY82OXs/GXbjwhHx6d56YugXLuCyvfFxC7mXC9wF58bPwcYRCBSZt9CRl0OMBAFybxjdwsFMloRRhdz7f3hhlqF8Nrs1sxG1HhgiMcnrZqovNfb3Tw9K1RPYATazXxQrjcI7YHvJx0AvtHFUsn+/A0GtpKUuuPbaVdkYgE1Tye0AsAcey6RW4xhJywZglKrzDk7vfyUiU5CObeLh4/dhub3k111rDPL8v6v9t40fteduJoFLziHotQwdl37UALL7PwWZY5HuJvaBqHY2LsGs/ptGMB9ZCzxA85jfDw8lrZQ7P97SAoC34Ihs8D6vkKT9HUKHIXh19O5AAa70jReru0ej179IBjvs8m9nDwDNdY3sIsdhUU8WQ3BftDF6M8OzvgyLKDvjSs1Izag+Asl2Ze7RAQfQ2RvbfkDm9KEFnDQtXtzF4Cu1Ed6io2j1zI71JFQpIf6zb1qeNrhqulbJ15owGkQmHBgD8K+bDd1CCU4kA26axypV00XDsjfwdtFHgtUO3AlUVUim0QTMk9ATc="
   on:

Gemfile

@@ -11,12 +11,11 @@ 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 'fakefs',                      :require => false
-  gem 'zabbixapi',                   :require => false
-  gem 'rspec-puppet-facts',          :require => false, :git => 'https://github.com/mcanevet/rspec-puppet-facts', :ref => '9541292d4fc35db3be1badace673c1108154b571'
+  gem 'voxpupuli-test', '~> 2.0',  :require => false
+  gem 'coveralls',                 :require => false
+  gem 'simplecov-console',         :require => false
+  gem 'fakefs',                    :require => false
+  gem 'zabbixapi',                 :require => false
 end
 
 group :development do

spec/acceptance/agent_spec.rb

@@ -17,7 +17,7 @@ class { 'zabbix::agent':
       }
       EOS
 
-      cleanup_zabbix
+      prepare_host
 
       # Run it twice and test for idempotency
       apply_manifest(pp, catch_failures: true)

spec/acceptance/server_spec.rb

@@ -20,7 +20,7 @@ class { 'zabbix::database': } ->
         class { 'zabbix::server': }
       EOS
 
-      cleanup_zabbix
+      prepare_host
 
       # Run it twice and test for idempotency
       apply_manifest(pp, catch_failures: true)

spec/acceptance/zabbix_application_spec.rb

@@ -38,7 +38,7 @@ class { 'zabbix':
     # setup zabbix. Apache module isn't idempotent and requires a second run
     it 'works with no error on the first apply' do
       # Cleanup old database
-      cleanup_zabbix
+      prepare_host
 
       apply_manifest(pp1, catch_failures: true)
     end

spec/acceptance/zabbix_host_spec.rb

@@ -31,7 +31,7 @@ class { 'zabbix':
     # setup zabbix. Apache module isn't idempotent and requires a second run
     it 'works with no error on the first apply' do
       # Cleanup old database
-      cleanup_zabbix
+      prepare_host
 
       apply_manifest(pp1, catch_failures: true)
     end