Skip to content

Commit

Permalink
Merge pull request #182 from voxpupuli/modulesync
Browse files Browse the repository at this point in the history
modulesync 2.6.0
  • Loading branch information
bastelfreak authored Mar 29, 2019
2 parents c0ea604 + 12d2911 commit 2e120d6
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '2.5.1'
modulesync_config_version: '2.6.0'
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ dist: xenial
language: ruby
cache: bundler
before_install:
- sh ./.travis/setup.sh
- gem update --system
- gem update bundler
- bundle --version
script:
- 'bundle exec rake $CHECK'
matrix:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.5.1
FROM ruby:2.5.3

WORKDIR /opt/puppet

Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ group :test do
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', :require => false
gem 'puppet-lint-unquoted_string-check', :require => false
gem 'puppet-lint-variable_contains_upcase', :require => false
gem 'puppet-lint-absolute_classname-check', :require => false
gem 'metadata-json-lint', :require => false
gem 'redcarpet', :require => false
gem 'rubocop', '~> 0.49.1', :require => false
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ package can be found in jessie-backports. When using
can be used:

```puppet
include ::apt
include ::apt::backports
include apt
include apt::backports
apt::pin { 'jessie-backports-letsencrypt':
release => 'jessie-backports',
packages => prefix(['acme', 'cryptography', 'openssl', 'psutil', 'setuptools', 'pyasn1', 'pkg-resources'], 'python-'),
Expand All @@ -47,15 +47,15 @@ To install the Let's Encrypt client with the default configuration settings you
must provide your email address to register with the Let's Encrypt servers:

```puppet
class { ::letsencrypt:
class { letsencrypt:
email => '[email protected]',
}
```

If using Ubuntu16.04 with `install_method` to default `package`, you can enforce upgrade of package from 0.4 to 0.7 with :

```puppet
class { ::letsencrypt:
class { letsencrypt:
email => '[email protected]',
package_ensure => 'latest',
}
Expand All @@ -64,7 +64,7 @@ class { ::letsencrypt:
If using EL7 without EPEL-preconfigured, add `configure_epel`:

```puppet
class { ::letsencrypt:
class { letsencrypt:
configure_epel => true,
email => '[email protected]',
}
Expand All @@ -79,7 +79,7 @@ the client.
Alternatively, you can specify your email address in the $config hash:

```puppet
class { ::letsencrypt:
class { letsencrypt:
config => {
email => '[email protected]',
server => 'https://acme-v01.api.letsencrypt.org/directory',
Expand All @@ -94,7 +94,7 @@ If you don't wish to provide your email address, you can set the
`unsafe_registration` parameter to `true` (this is not recommended):

```puppet
class { ::letsencrypt:
class { letsencrypt:
unsafe_registration => true,
}
```
Expand Down
1 change: 1 addition & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ end

PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.absolute_classname_reverse = true
PuppetLint.configuration.send('relative')
PuppetLint.configuration.send('disable_140chars')
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
Expand Down
2 changes: 1 addition & 1 deletion manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
}

if $configure_epel {
include ::epel
include epel
Class['epel'] -> Package['letsencrypt']
}
}
Expand Down

0 comments on commit 2e120d6

Please sign in to comment.