Skip to content

Commit

Permalink
Merge branch 'master' into nginx/repo_manage
Browse files Browse the repository at this point in the history
  • Loading branch information
@nmaludy
nmaludy authored Sep 1, 2017
2 parents 2ab8ba9 + cc0b97f commit 79edaed
Show file tree
Hide file tree
Showing 23 changed files with 305 additions and 84 deletions.
20 changes: 16 additions & 4 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,25 @@ else
gem 'puppet', :require => false
end

gem 'puppetlabs_spec_helper', '>= 0.1.0'
gem 'puppet-lint', '>= 0.3.2'
gem 'facter', '>= 1.7.0'
gem 'puppetlabs_spec_helper', '>= 0.1.0'
gem 'puppet-lint', '>= 0.3.2'
gem 'facter', '>= 1.7.0'
gem 'puppet-lint-absolute_classname-check', '>= 0.2.4'
gem 'puppet-lint-absolute_template_path', '>= 1.0.1'
gem 'puppet-lint-alias-check', '>= 0.1.1'
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', '>= 0.1.2'
gem 'puppet-lint-concatenated_template_files-check', '>= 0.1.1'
gem 'puppet-lint-file_ensure-check', '>= 0.3.1'
gem 'puppet-lint-file_source_rights-check', '>= 0.1.1'
gem 'puppet-lint-leading_zero-check', '>= 0.1.1'
gem 'puppet-lint-resource_reference_syntax', '>= 1.0.10'
gem 'puppet-lint-trailing_comma-check', '>= 0.3.2'
gem 'puppet-lint-unquoted_string-check', '>= 0.3.0'
gem 'puppet-lint-version_comparison-check', '>= 0.2.1'

gem 'coveralls', :require => false

gem 'puppet-blacksmith', '>= 3.1.1'
gem 'puppet-blacksmith', '>= 3.1.1'

### ADD USER GEMS HERE ###

46 changes: 41 additions & 5 deletions Gemfile.lock.3.8.7.ruby1.8.7
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ GEM
tins (~> 1.6)
diff-lcs (1.3)
docile (1.1.5)
facter (2.5.0)
facter (2.5.1)
hiera (1.3.4)
json_pure
json (1.8.6)
json_pure (1.8.3)
metaclass (0.0.4)
mime-types (1.25.1)
mocha (1.2.1)
mocha (1.3.0)
metaclass (~> 0.0.1)
puppet (3.8.7)
facter (> 1.6, < 3)
Expand All @@ -26,6 +26,30 @@ GEM
puppet (>= 2.7.16)
rest-client
puppet-lint (2.3.0)
puppet-lint-absolute_classname-check (0.2.4)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-absolute_template_path (1.0.1)
puppet-lint (>= 1.1, < 3.0)
puppet-lint-alias-check (0.1.1)
puppet-lint (>= 1.0)
puppet-lint-classes_and_types_beginning_with_digits-check (0.1.2)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-concatenated_template_files-check (0.1.1)
puppet-lint (>= 1.1, < 3.0)
puppet-lint-file_ensure-check (0.3.1)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-file_source_rights-check (0.1.1)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-leading_zero-check (0.1.1)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-resource_reference_syntax (1.0.10)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-trailing_comma-check (0.3.2)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-unquoted_string-check (0.3.0)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-version_comparison-check (0.2.1)
puppet-lint (>= 1.0, < 3.0)
puppet-syntax (2.4.1)
rake
puppetlabs_spec_helper (1.2.2)
Expand Down Expand Up @@ -55,7 +79,7 @@ GEM
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.1)
simplecov-html (0.10.2)
term-ansicolor (1.3.2)
tins (~> 1.0)
thor (0.19.4)
Expand All @@ -68,9 +92,21 @@ DEPENDENCIES
coveralls
facter (>= 1.7.0)
puppet (= 3.8.7)
puppet-blacksmith (>= 3.3.1)
puppet-blacksmith (>= 3.1.1)
puppet-lint (>= 0.3.2)
puppet-lint-absolute_classname-check (>= 0.2.4)
puppet-lint-absolute_template_path (>= 1.0.1)
puppet-lint-alias-check (>= 0.1.1)
puppet-lint-classes_and_types_beginning_with_digits-check (>= 0.1.2)
puppet-lint-concatenated_template_files-check (>= 0.1.1)
puppet-lint-file_ensure-check (>= 0.3.1)
puppet-lint-file_source_rights-check (>= 0.1.1)
puppet-lint-leading_zero-check (>= 0.1.1)
puppet-lint-resource_reference_syntax (>= 1.0.10)
puppet-lint-trailing_comma-check (>= 0.3.2)
puppet-lint-unquoted_string-check (>= 0.3.0)
puppet-lint-version_comparison-check (>= 0.2.1)
puppetlabs_spec_helper (>= 0.1.0)

BUNDLED WITH
1.15.3
1.15.4
48 changes: 42 additions & 6 deletions Gemfile.lock.3.8.7.ruby1.9.3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GEM
docile (1.1.5)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
facter (2.5.0)
facter (2.5.1)
hiera (1.3.4)
json_pure
http-cookie (1.0.3)
Expand All @@ -20,7 +20,7 @@ GEM
json_pure (2.1.0)
metaclass (0.0.4)
mime-types (2.99.3)
mocha (1.2.1)
mocha (1.3.0)
metaclass (~> 0.0.1)
netrc (0.11.0)
puppet (3.8.7)
Expand All @@ -31,9 +31,33 @@ GEM
puppet (>= 2.7.16)
rest-client (~> 1.8.0)
puppet-lint (2.3.0)
puppet-lint-absolute_classname-check (0.2.4)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-absolute_template_path (1.0.1)
puppet-lint (>= 1.1, < 3.0)
puppet-lint-alias-check (0.1.1)
puppet-lint (>= 1.0)
puppet-lint-classes_and_types_beginning_with_digits-check (0.1.2)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-concatenated_template_files-check (0.1.1)
puppet-lint (>= 1.1, < 3.0)
puppet-lint-file_ensure-check (0.3.1)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-file_source_rights-check (0.1.1)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-leading_zero-check (0.1.1)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-resource_reference_syntax (1.0.10)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-trailing_comma-check (0.3.2)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-unquoted_string-check (0.3.0)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-version_comparison-check (0.2.1)
puppet-lint (>= 1.0, < 3.0)
puppet-syntax (2.4.1)
rake
puppetlabs_spec_helper (2.3.1)
puppetlabs_spec_helper (2.3.2)
mocha (~> 1.0)
puppet-lint (~> 2.0)
puppet-syntax (~> 2.0)
Expand All @@ -55,14 +79,14 @@ GEM
rspec-mocks (3.6.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-puppet (2.6.5)
rspec-puppet (2.6.8)
rspec
rspec-support (3.6.0)
simplecov (0.14.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.1)
simplecov-html (0.10.2)
term-ansicolor (1.3.2)
tins (~> 1.0)
thor (0.19.4)
Expand All @@ -80,7 +104,19 @@ DEPENDENCIES
puppet (= 3.8.7)
puppet-blacksmith (>= 3.1.1)
puppet-lint (>= 0.3.2)
puppet-lint-absolute_classname-check (>= 0.2.4)
puppet-lint-absolute_template_path (>= 1.0.1)
puppet-lint-alias-check (>= 0.1.1)
puppet-lint-classes_and_types_beginning_with_digits-check (>= 0.1.2)
puppet-lint-concatenated_template_files-check (>= 0.1.1)
puppet-lint-file_ensure-check (>= 0.3.1)
puppet-lint-file_source_rights-check (>= 0.1.1)
puppet-lint-leading_zero-check (>= 0.1.1)
puppet-lint-resource_reference_syntax (>= 1.0.10)
puppet-lint-trailing_comma-check (>= 0.3.2)
puppet-lint-unquoted_string-check (>= 0.3.0)
puppet-lint-version_comparison-check (>= 0.2.1)
puppetlabs_spec_helper (>= 0.1.0)

BUNDLED WITH
1.15.3
1.15.4
61 changes: 42 additions & 19 deletions Gemfile.lock.3.8.7.ruby2.0.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,16 @@ GEM
docile (1.1.5)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
facter (2.5.0)
fast_gettext (1.1.0)
gettext (3.2.3)
locale (>= 2.0.5)
text (>= 1.3.0)
gettext-setup (0.26)
fast_gettext (~> 1.1.0)
gettext (>= 3.0.2)
locale
facter (2.5.1)
hiera (1.3.4)
json_pure
http-cookie (1.0.3)
domain_name (~> 0.5)
json (2.1.0)
json_pure (2.1.0)
locale (2.1.2)
metaclass (0.0.4)
mime-types (2.99.3)
mocha (1.2.1)
mocha (1.3.0)
metaclass (~> 0.0.1)
netrc (0.11.0)
puppet (3.8.7)
Expand All @@ -40,9 +31,33 @@ GEM
puppet (>= 2.7.16)
rest-client (~> 1.8.0)
puppet-lint (2.3.0)
puppet-lint-absolute_classname-check (0.2.4)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-absolute_template_path (1.0.1)
puppet-lint (>= 1.1, < 3.0)
puppet-lint-alias-check (0.1.1)
puppet-lint (>= 1.0)
puppet-lint-classes_and_types_beginning_with_digits-check (0.1.2)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-concatenated_template_files-check (0.1.1)
puppet-lint (>= 1.1, < 3.0)
puppet-lint-file_ensure-check (0.3.1)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-file_source_rights-check (0.1.1)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-leading_zero-check (0.1.1)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-resource_reference_syntax (1.0.10)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-trailing_comma-check (0.3.2)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-unquoted_string-check (0.3.0)
puppet-lint (>= 1.0, < 3.0)
puppet-lint-version_comparison-check (0.2.1)
puppet-lint (>= 1.0, < 3.0)
puppet-syntax (2.4.1)
rake
puppetlabs_spec_helper (2.3.1)
puppetlabs_spec_helper (2.3.2)
mocha (~> 1.0)
puppet-lint (~> 2.0)
puppet-syntax (~> 2.0)
Expand Down Expand Up @@ -71,15 +86,11 @@ GEM
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.1)
simplecov-html (0.10.2)
term-ansicolor (1.3.2)
tins (~> 1.0)
text (1.3.1)
thor (0.19.4)
tins (1.6.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)

PLATFORMS
ruby
Expand All @@ -88,9 +99,21 @@ DEPENDENCIES
coveralls
facter (>= 1.7.0)
puppet (= 3.8.7)
puppet-blacksmith (>= 3.3.1)
puppet-blacksmith (>= 3.1.1)
puppet-lint (>= 0.3.2)
puppet-lint-absolute_classname-check (>= 0.2.4)
puppet-lint-absolute_template_path (>= 1.0.1)
puppet-lint-alias-check (>= 0.1.1)
puppet-lint-classes_and_types_beginning_with_digits-check (>= 0.1.2)
puppet-lint-concatenated_template_files-check (>= 0.1.1)
puppet-lint-file_ensure-check (>= 0.3.1)
puppet-lint-file_source_rights-check (>= 0.1.1)
puppet-lint-leading_zero-check (>= 0.1.1)
puppet-lint-resource_reference_syntax (>= 1.0.10)
puppet-lint-trailing_comma-check (>= 0.3.2)
puppet-lint-unquoted_string-check (>= 0.3.0)
puppet-lint-version_comparison-check (>= 0.2.1)
puppetlabs_spec_helper (>= 0.1.0)

BUNDLED WITH
1.15.1
1.15.4
Loading

0 comments on commit 79edaed

Please sign in to comment.