Skip to content

Commit

Permalink
add Ubuntu 14.04 and 16.04
Browse files Browse the repository at this point in the history
  • Loading branch information
faxm0dem committed Apr 5, 2018
1 parent 3642539 commit 1149a8d
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 3 deletions.
6 changes: 6 additions & 0 deletions data/osfamily/Debian/14.04/default.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
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
conserver::status_cmd: true
16 changes: 16 additions & 0 deletions data/osfamily/Debian/16.04/default.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
conserver::server_init_config_file: /usr/lib/systemd/system/conserver.service
conserver::server_init_config_tpl: conserver/server/init_config_file_systemd.erb
conserver::server_init_config_hash:
Unit:
Description: Conserver Serial-Port Console Daemon
After: network.target
Service:
Type: forking
ExecStart: /usr/sbin/conserver -d
User: root
Install:
WantedBy: multi-user.target
conserver::server_user: root
conserver::status_cmd: true
conserver::has_systemd: true
21 changes: 19 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,27 @@
],
"operatingsystem_support": [
{
"operatingsystem": "RedHat"
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"6.0",
"7.0"
]
},
{
"operatingsystem": "Debian"
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"16.04",
"14.04",
"12.04"
]
},
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"7.0",
"8.0",
"9.0"
]
}
]
}
2 changes: 1 addition & 1 deletion 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].each do |osname|
%w[RedHat7 Debian8 Debian9 Ubuntu16.04].each do |osname|
osfixtures = os_fixtures[osname]

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

0 comments on commit 1149a8d

Please sign in to comment.