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

Allow for non-linux #83

Merged
merged 1 commit into from
Sep 30, 2014
Merged

Allow for non-linux #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 manifests/mcollective.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
File {
ensure => present,
owner => 'root',
group => 'root',
group => '0',
Copy link
Contributor

Choose a reason for hiding this comment

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

if you make those undef, that should work too/better/just as well.

mode => '0644',
}
# Install the agent and its ddl file
Expand Down
2 changes: 1 addition & 1 deletion manifests/mcollective/application.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
File {
ensure => present,
owner => 'root',
group => 'root',
group => '0',
mode => '0644',
}
# Install the agent and its ddl file
Expand Down
8 changes: 4 additions & 4 deletions spec/classes/mcollective/application_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/application/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
Copy link
Contributor

Choose a reason for hiding this comment

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

but that would make testing more tricky, maybe…

'mode' => '0644',
'source' => 'puppet:///modules/r10k/application/r10k.rb'
)
}
it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/agent/r10k.ddl").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644',
'source' => 'puppet:///modules/r10k/agent/r10k.ddl'
)
Expand All @@ -40,15 +40,15 @@
it { should contain_file("/usr/libexec/mcollective/mcollective/application/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644',
'source' => 'puppet:///modules/r10k/application/r10k.rb'
)
}
it { should contain_file("/usr/libexec/mcollective/mcollective/agent/r10k.ddl").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644',
'source' => 'puppet:///modules/r10k/agent/r10k.ddl'
)
Expand Down
18 changes: 9 additions & 9 deletions spec/classes/mcollective_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/application/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}
it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/agent/r10k.ddl").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}

it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/agent/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}
Expand All @@ -47,22 +47,22 @@
it { should contain_file("/usr/libexec/mcollective/mcollective/application/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}
it { should contain_file("/usr/libexec/mcollective/mcollective/agent/r10k.ddl").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}

it { should contain_file("/usr/libexec/mcollective/mcollective/agent/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}
Expand All @@ -82,23 +82,23 @@
it { should contain_file("/usr/share/mcollective/plugins/mcollective/application/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}

it { should contain_file("/usr/share/mcollective/plugins/mcollective/agent/r10k.ddl").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}

it { should contain_file("/usr/share/mcollective/plugins/mcollective/agent/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}
Expand Down