Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions data/osfamily/Debian/12.04/default.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions data/osfamily/Debian/14.04/default.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions data/osfamily/Debian/16.04/default.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions data/osfamily/Debian/7/default.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions data/osfamily/Debian/8/default.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions data/osfamily/Debian/9/default.yaml

This file was deleted.

7 changes: 6 additions & 1 deletion data/osfamily/Debian/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
conserver::server_package_name: conserver-server
conserver::client_package_name: conserver-client
conserver::service_name: conserver-server
conserver::confdir: /etc/conserver'
conserver::confdir: /etc/conserver
conserver::restart_cmd: /usr/sbin/service conserver-server restart
conserver::reload_cmd: service conserver-server reload
conserver::status_cmd: true
conserver::server_init_config_file: /etc/conserver/server.local
conserver::server_init_config_tpl: conserver/server/init_config_file.erb
conserver::server_init_config_hash: {}
conserver::server_user: conservr
1 change: 1 addition & 0 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"18.04",
"16.04",
"14.04",
"12.04"
Expand Down
4 changes: 2 additions & 2 deletions spec/classes/systemd_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
os_fixtures = @os_fixtures

describe 'conserver', type: 'class' do
%w[RedHat7 Debian8 Debian9 Ubuntu16.04].each do |osname|
%w[RedHat7].each do |osname|
osfixtures = os_fixtures[osname]

context "On os `#{osname}`" do
Expand All @@ -14,7 +14,7 @@
it { should contain_systemd__unit_file("#{osfixtures[:params][:server_service_name]}.service") }
end
end
['RedHat6', 'Debian7', 'Ubuntu12.04'].each do |osname|
%w[RedHat6 Debian7 Debian8 Debian9 Ubuntu12.04 Ubuntu16.04].each do |osname|
osfixtures = os_fixtures[osname]

context "On os `#{osname}`" do
Expand Down
13 changes: 13 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -143,5 +143,18 @@
server_package_name: 'conserver-server',
client_package_name: 'conserver-client'
}
),
'Ubuntu18.04' => @common_fixtures.merge(
facts: {
os: {
family: 'Debian',
release: { major: '18.04' }
}
},
params: {
server_service_name: 'conserver-server',
server_package_name: 'conserver-server',
client_package_name: 'conserver-client'
}
)
}