-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #81 from jordiprats/master
merge PR-59 with some changes
- Loading branch information
Showing
10 changed files
with
224 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| fixtures: | ||
| forge_modules: | ||
| stdlib: puppetlabs/stdlib | ||
| eyplib: eyp/eyplib | ||
| symlinks: | ||
| systemd: "#{source_dir}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| --format documentation | ||
| --color | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| class systemd::logind( | ||
| $handle_hibernate_key = 'hibernate', | ||
| $handle_lid_switch = 'suspend', | ||
| $handle_lid_switch_docked = 'ignore', | ||
| $handle_power_key = 'poweroff', | ||
| $handle_suspend_key = 'suspend', | ||
| $hibernate_key_ignore_inhibited = false, | ||
| $holdoff_timeout_sec = 30, | ||
| $idle_action = 'ignore', | ||
| $idle_action_sec = '30min', | ||
| $inhibit_delay_max_sec = 5, | ||
| $inhibitors_max = 8192, | ||
| $kill_exclude_users = ['root'], | ||
| $kill_only_users = [], | ||
| $kill_user_processes = true, | ||
| $lid_switch_ignore_inhibited = true, | ||
| $n_auto_vts = 6, | ||
| $power_key_ignore_inhibited = false, | ||
| $remove_ipc = yesno2bool($systemd::removeipc), | ||
| $reserve_vt = 6, | ||
| $runtime_directory_size = '10%', | ||
| $sessions_max = 8192, | ||
| $suspend_key_ignore_inhibited = false, | ||
| $user_tasks_max = '33%', | ||
| ) inherits systemd { | ||
|
|
||
| validate_bool($hibernate_key_ignore_inhibited, $kill_user_processes, | ||
| $lid_switch_ignore_inhibited, $power_key_ignore_inhibited, | ||
| $remove_ipc, $suspend_key_ignore_inhibited) | ||
|
|
||
| validate_array($kill_exclude_users, $kill_only_users) | ||
|
|
||
| validate_integer([$inhibitors_max, $n_auto_vts, $reserve_vt]) | ||
|
|
||
| validate_re($handle_hibernate_key, ['^ignore$', '^poweroff$', '^reboot$', | ||
| '^halt$', '^kexec$', '^suspend$', '^hibernate$', | ||
| '^hybrid-sleep$', '^lock$']) | ||
|
|
||
| validate_re($handle_hibernate_key, ['^ignore$', '^poweroff$', '^reboot$', | ||
| '^halt$', '^kexec$', '^suspend$', '^hibernate$', | ||
| '^hybrid-sleep$', '^lock$']) | ||
|
|
||
| validate_re($handle_lid_switch, ['^ignore$', '^poweroff$', '^reboot$', | ||
| '^halt$', '^kexec$', '^suspend$', | ||
| '^hibernate$', '^hybrid-sleep$', '^lock$']) | ||
|
|
||
| validate_re($handle_lid_switch_docked, ['^ignore$', '^poweroff$', | ||
| '^reboot$', '^halt$', '^kexec$', | ||
| '^suspend$', '^hibernate$', | ||
| '^hybrid-sleep$', '^lock$']) | ||
|
|
||
| validate_re($handle_power_key, ['^ignore$', '^poweroff$', '^reboot$', | ||
| '^halt$', '^kexec$', '^suspend$', | ||
| '^hibernate$', '^hybrid-sleep$', '^lock$']) | ||
|
|
||
| validate_re($handle_suspend_key, ['^ignore$', '^poweroff$', '^reboot$', | ||
| '^halt$', '^kexec$', '^suspend$', | ||
| '^hibernate$', '^hybrid-sleep$', '^lock$']) | ||
|
|
||
|
|
||
| file { '/etc/systemd/logind.conf': | ||
| ensure => 'present', | ||
| owner => 'root', | ||
| group => 'root', | ||
| mode => '0644', | ||
| content => template("${module_name}/logind.erb"), | ||
| notify => Exec['systemctl reload'], | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| require 'spec_helper' | ||
| describe 'systemd::logind' do | ||
| on_supported_os.each do |os, facts| | ||
| context "on #{os}" do | ||
| let(:facts) { facts } | ||
| context 'with defaults for all parameters' do | ||
| it { should contain_class('systemd::logind') } | ||
| it do | ||
| should contain_file('/etc/systemd/logind.conf') | ||
| .with_content(/KillExcludeUsers=root/) | ||
| .with_content(/KillUserProcesses=yes/) | ||
| .with_content(/NAutoVTs=6/) | ||
| .without_content(/KillOnlyUsers/) | ||
| .with_content(/InhibitDelayMaxSec=5/) | ||
| end | ||
| end | ||
| context 'with some values set' do | ||
| let(:params) do | ||
| { | ||
| :inhibit_delay_max_sec => 55, | ||
| :kill_only_users => ['foo', 'bar'] | ||
| } | ||
| end | ||
| it do | ||
| should contain_file('/etc/systemd/logind.conf') | ||
| .with_content(/KillExcludeUsers=root/) | ||
| .with_content(/KillUserProcesses=yes/) | ||
| .with_content(/NAutoVTs=6/) | ||
| .with_content(/KillOnlyUsers=foo bar/) | ||
| .with_content(/InhibitDelayMaxSec=55/) | ||
| end | ||
| end | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters