Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modulesync 0.19.3 #1004

Merged
merged 2 commits into from
Jan 20, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '0.19.0'
modulesync_config_version: '0.19.3'
1 change: 1 addition & 0 deletions .pmtignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docs/
8 changes: 6 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ Style/WhileUntilModifier:
Lint/AmbiguousRegexpLiteral:
Enabled: True

Lint/Eval:
Security/Eval:
Enabled: True

Lint/BlockAlignment:
@@ -302,7 +302,7 @@ Style/EmptyLiteral:
Metrics/LineLength:
Enabled: False

Style/MethodCallParentheses:
Style/MethodCallWithoutArgsParentheses:
Enabled: True

Style/MethodDefParentheses:
@@ -518,3 +518,7 @@ RSpec/RepeatedDescription:

RSpec/NestedGroups:
Enabled: False

# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
Security/YAMLLoad:
Enabled: false
1 change: 1 addition & 0 deletions .yardopts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
--markup markdown
--output-dir docs/
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -26,7 +26,9 @@ group :test do
gem 'puppet-blacksmith', :require => false
gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
gem 'puppet-strings', '~> 1.0.0', :require => false
gem 'rubocop-rspec', '~> 1.9.0', :require => false if RUBY_VERSION >= '2.3.0'
gem 'redcarpet', :require => false
gem 'rubocop', '~> 0.47.0', :require => false if RUBY_VERSION >= '2.3.0'
gem 'rubocop-rspec', '~> 1.10.0', :require => false if RUBY_VERSION >= '2.3.0'
gem 'mocha', '>= 1.2.1', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
18 changes: 0 additions & 18 deletions spec/classes/nginx_spec.rb
Original file line number Diff line number Diff line change
@@ -1076,24 +1076,6 @@
)
)
end
it do
is_expected.to contain_file('/etc/nginx/streams-available').without(
%w(
ignore
purge
recurse
)
)
end
it do
is_expected.to contain_file('/etc/nginx/streams-enabled').without(
%w(
ignore
purge
recurse
)
)
end
end

context 'when daemon_user = www-data' do