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.

Sign up for GitHub

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

Add support for Ubuntu 18.04 #24

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for Ubuntu 18.04 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d65fd0
Add support for Ubuntu 18.04
gbristol Jul 8, 2019
84f4350
Lock RubyGems to less than v3.0.0
gbristol Jul 12, 2019
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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cache: bundler
before_install:
- bundle -v
- rm Gemfile.lock || true
- gem update --system
- gem install "rubygems-update:<3.0.0" --no-document
- gem update bundler
- gem --version
- bundle -v
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ The following defines are typically called from an instance.

## Limitations

This module is currently tested and working on RedHat and CentOS 6, and 7, Debian 8, and 9, Ubuntu 14.04, and 16.04 systems.
This module is currently tested and working on RedHat and CentOS 6, and 7, Debian 8, and 9, Ubuntu 14.04, 16.04, and 18.04 systems.

## Development

Expand Down
2 changes: 1 addition & 1 deletion manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
$cacert_rehash = 'c_rehash'
$limits_config_dir = '/etc/default'
case $::operatingsystemmajrelease {
'8', '9', '16.04': {
'8', '9', '16.04', '18.04': {
$service_type = 'systemd'
$ssl_version_min_support = true
}
Expand Down
1 change: 1 addition & 0 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"18.04",
"16.04",
"14.04"
]
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/ds389_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
}

case os_facts[:operatingsystemmajrelease]
when '8', '9', '16.04'
when '8', '9', '16.04', '18.04'
it {
is_expected.to contain_ini_setting('dirsrv ulimit').with(
ensure: 'present',
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/instance_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
}

case os_facts[:operatingsystemmajrelease]
when '8', '9', '16.04'
when '8', '9', '16.04', '18.04'
it {
is_expected.to contain_exec('stop specdirectory to create new token').with(
command: '/bin/systemctl stop dirsrv@specdirectory ; sleep 2',
Expand Down Expand Up @@ -758,7 +758,7 @@
}

case os_facts[:operatingsystemmajrelease]
when '8', '9', '16.04'
when '8', '9', '16.04', '18.04'
it {
is_expected.to contain_exec('stop ldap01 to create new token').with(
command: '/bin/systemctl stop dirsrv@ldap01 ; sleep 2',
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/service_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
case os_facts[:osfamily]
when 'Debian'
case os_facts[:operatingsystemmajrelease]
when '8', '9', '16.04'
when '8', '9', '16.04', '18.04'
it {
is_expected.to contain_service('dirsrv@specdirectory').with(
ensure: 'running',
Expand Down Expand Up @@ -161,7 +161,7 @@
case os_facts[:osfamily]
when 'Debian'
case os_facts[:operatingsystemmajrelease]
when '8', '9', '16.04'
when '8', '9', '16.04', '18.04'
it {
is_expected.to contain_service('dirsrv@ldap01').with(
ensure: 'stopped',
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/ssl_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
case os_facts[:osfamily]
when 'Debian'
case os_facts[:operatingsystemmajrelease]
when '8', '9', '16.04'
when '8', '9', '16.04', '18.04'
it {
is_expected.to contain_file('/etc/dirsrv/slapd-specdirectory/ssl.ldif').with(
ensure: 'file',
Expand Down Expand Up @@ -290,7 +290,7 @@
case os_facts[:osfamily]
when 'Debian'
case os_facts[:operatingsystemmajrelease]
when '8', '9', '16.04'
when '8', '9', '16.04', '18.04'
it {
is_expected.to contain_file('/etc/dirsrv/slapd-ldap01/ssl.ldif').with(
ensure: 'file',
Expand Down