Skip to content

Commit 2e120d6

Browse files
authored
Merge pull request #182 from voxpupuli/modulesync
modulesync 2.6.0
2 parents c0ea604 + 12d2911 commit 2e120d6

File tree

7 files changed

+15
-11
lines changed

7 files changed

+15
-11
lines changed

.msync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
modulesync_config_version: '2.5.1'
1+
modulesync_config_version: '2.6.0'

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ dist: xenial
33
language: ruby
44
cache: bundler
55
before_install:
6-
- sh ./.travis/setup.sh
6+
- gem update --system
7+
- gem update bundler
8+
- bundle --version
79
script:
810
- 'bundle exec rake $CHECK'
911
matrix:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.5.1
1+
FROM ruby:2.5.3
22

33
WORKDIR /opt/puppet
44

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ group :test do
2020
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', :require => false
2121
gem 'puppet-lint-unquoted_string-check', :require => false
2222
gem 'puppet-lint-variable_contains_upcase', :require => false
23+
gem 'puppet-lint-absolute_classname-check', :require => false
2324
gem 'metadata-json-lint', :require => false
2425
gem 'redcarpet', :require => false
2526
gem 'rubocop', '~> 0.49.1', :require => false

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ package can be found in jessie-backports. When using
3030
can be used:
3131

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

4949
```puppet
50-
class { ::letsencrypt:
50+
class { letsencrypt:
5151
email => '[email protected]',
5252
}
5353
```
5454

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

5757
```puppet
58-
class { ::letsencrypt:
58+
class { letsencrypt:
5959
email => '[email protected]',
6060
package_ensure => 'latest',
6161
}
@@ -64,7 +64,7 @@ class { ::letsencrypt:
6464
If using EL7 without EPEL-preconfigured, add `configure_epel`:
6565

6666
```puppet
67-
class { ::letsencrypt:
67+
class { letsencrypt:
6868
configure_epel => true,
6969
email => '[email protected]',
7070
}
@@ -79,7 +79,7 @@ the client.
7979
Alternatively, you can specify your email address in the $config hash:
8080

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

9696
```puppet
97-
class { ::letsencrypt:
97+
class { letsencrypt:
9898
unsafe_registration => true,
9999
}
100100
```

Rakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ end
1111

1212
PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
1313
PuppetLint.configuration.fail_on_warnings = true
14+
PuppetLint.configuration.absolute_classname_reverse = true
1415
PuppetLint.configuration.send('relative')
1516
PuppetLint.configuration.send('disable_140chars')
1617
PuppetLint.configuration.send('disable_class_inherits_from_params_class')

manifests/install.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
}
6161

6262
if $configure_epel {
63-
include ::epel
63+
include epel
6464
Class['epel'] -> Package['letsencrypt']
6565
}
6666
}

0 commit comments

Comments
 (0)