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

Jump to bottom

Add FreeBSD 12 support #179

Merged
merged 11 commits into from
Jul 28, 2019
Merged

Add FreeBSD 12 support #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b2c5b7e
Add FreeBSD platform support
olevole Jul 8, 2019
cad5c06
Add FreeBSD platform support
olevole Jul 8, 2019
e66e999
Merge branch 'master' of github.com:olevole/puppet-grafana
olevole Jul 8, 2019
4277076
Merge branch 'master' of github.com:olevole/puppet-grafana
olevole Jul 8, 2019
b9e566a
Merge branch 'master' of github.com:olevole/puppet-grafana
olevole Jul 28, 2019
d661e22
fix typo
olevole Jul 28, 2019
e4aa1ef
repo: added case for FreeBSD OS family
olevole Jul 28, 2019
e1aeca5
fix typo
olevole Jul 28, 2019
b37bdb0
repo and package method are the same for FreeBSD
olevole Jul 28, 2019
4333ff9
properly aligned
olevole Jul 28, 2019
8cd1f6e
fix spec: proper data_dir value for FreeBSD
olevole Jul 28, 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
7 changes: 7 additions & 0 deletions data/family/FreeBSD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
grafana::cfg_location: '/usr/local/etc/grafana.ini'
grafana::data_dir: '/var/db/grafana'
grafana::install_method: 'repo'
grafana::manage_package_repo: false
grafana::package_name: 'grafana6'
grafana::service_name: 'grafana'
13 changes: 13 additions & 0 deletions manifests/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@
require => Package['fontconfig'],
}
}
'FreeBSD': {
package { 'grafana':
ensure => present,
name => $grafana::package_name,
provider => 'pkgng',
}
}
default: {
fail("${facts['os']['family']} not supported")
}
Expand Down Expand Up @@ -143,6 +150,12 @@
name => $grafana::package_name,
}
}
'FreeBSD': {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this package required? It doesn't sound like anything grafana specific. Is the FreeBSD package for grafana lacking a dependency? If this is a generic package, it might be already managed by other modules which results in a duplicate resource error.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the dependency already exists in the package. I just duplicated the previous entries (other distributions have no valid dependencies in grafana? I'll fix it now

package { 'grafana':
ensure => 'present', # pkgng provider doesn't have feature versionable
name => $grafana::package_name,
}
}
default: {
fail("${facts['os']['name']} not supported")
}
Expand Down
6 changes: 6 additions & 0 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
},
{
"operatingsystem": "Archlinux"
},
{
"operatingsystem": "FreeBSD",
"operatingsystemrelease": [
"12"
]
}
],
"requirements": [
Expand Down
19 changes: 17 additions & 2 deletions spec/classes/grafana_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,23 @@
it { is_expected.to contain_user('grafana').that_comes_before('File[/usr/share/grafana]') }
end

describe 'create data_dir' do
it { is_expected.to contain_file('/var/lib/grafana').with_ensure('directory') }
case facts[:osfamily]
when 'Archlinux'
describe 'create data_dir' do
it { is_expected.to contain_file('/var/lib/grafana').with_ensure('directory') }
end
when 'Debian'
describe 'create data_dir' do
it { is_expected.to contain_file('/var/lib/grafana').with_ensure('directory') }
end
when 'FreBSD'
describe 'create data_dir' do
it { is_expected.to contain_file('/var/db/grafana').with_ensure('directory') }
end
when 'RedHat'
describe 'create data_dir' do
it { is_expected.to contain_file('/var/lib/grafana').with_ensure('directory') }
end
end

describe 'manage install_dir' do
Expand Down