diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-04-13 13:32:41 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-04-13 13:32:41 -0300 |
| commit | 091c8514ea7243e8a71c572a990299b6aa7d9fbb (patch) | |
| tree | 92a21312e19d4a7b9729ccbb9691712cbebae6ce | |
| parent | 4d249d029f1f354e66140a0d6a9ee2221845ace0 (diff) | |
| download | puppet-nodo-091c8514ea7243e8a71c572a990299b6aa7d9fbb.tar.gz puppet-nodo-091c8514ea7243e8a71c572a990299b6aa7d9fbb.tar.bz2 | |
Coding style
| -rw-r--r-- | manifests/defines/ssh_config.pp | 6 | ||||
| -rw-r--r-- | manifests/defines/ssh_create_key.pp | 7 | ||||
| -rw-r--r-- | manifests/defines/ssh_known_hosts.pp | 6 | ||||
| -rw-r--r-- | manifests/subsystem/initramfs.pp | 8 |
4 files changed, 20 insertions, 7 deletions
diff --git a/manifests/defines/ssh_config.pp b/manifests/defines/ssh_config.pp index 62e1d66..79d9635 100644 --- a/manifests/defines/ssh_config.pp +++ b/manifests/defines/ssh_config.pp @@ -1,5 +1,9 @@ # Manage ssh config for a particular user -define ssh_config($owner, $home = '/home/$owner', $ssh_localhost_auth = false) { +define ssh_config( + $owner, + $home = '/home/$owner', + $ssh_localhost_auth = false +) { include nodo::subsystem::ssh_folder file { "${home}/.ssh/config": diff --git a/manifests/defines/ssh_create_key.pp b/manifests/defines/ssh_create_key.pp index e380b18..ec4bb67 100644 --- a/manifests/defines/ssh_create_key.pp +++ b/manifests/defines/ssh_create_key.pp @@ -1,4 +1,9 @@ -define ssh_create_key($owner, $group, $keyfile = 'id_rsa', $home = '/home/$owner') { +define ssh_create_key( + $owner, + $group, + $keyfile = 'id_rsa', + $home = '/home/$owner' +) { include nodo::subsystem::ssh_folder exec { "ssh-keygen-${owner}": diff --git a/manifests/defines/ssh_known_hosts.pp b/manifests/defines/ssh_known_hosts.pp index 50ae87e..84f25b2 100644 --- a/manifests/defines/ssh_known_hosts.pp +++ b/manifests/defines/ssh_known_hosts.pp @@ -1,5 +1,9 @@ # Manage known_hosts for a particular user -define ssh_known_host($owner, $home = '/home/$owner', $ssh_localhost_auth = false) { +define ssh_known_host( + $owner, + $home = '/home/$owner', + $ssh_localhost_auth = false +) { include nodo::subsystem::ssh_folder file { "${home}/.ssh/known_hosts": diff --git a/manifests/subsystem/initramfs.pp b/manifests/subsystem/initramfs.pp index acbf1b7..ad12ae2 100644 --- a/manifests/subsystem/initramfs.pp +++ b/manifests/subsystem/initramfs.pp @@ -1,7 +1,7 @@ class nodo::subsystem::initramfs( $keymap = hiera('nodo::initramfs::keymap', 'absent') ) { - # initramfs config + # Image config file { "/etc/kernel-img.conf": owner => "root", group => "root", @@ -10,7 +10,7 @@ class nodo::subsystem::initramfs( content => "do_initrd = Yes\n", } - # initramfs config + # Modules config file { "/etc/initramfs-tools/modules": owner => "root", group => "root", @@ -19,7 +19,7 @@ class nodo::subsystem::initramfs( source => "puppet:///modules/nodo/etc/initramfs-tools/modules", } - # keymap + # Keymap file { "/etc/initramfs-tools/conf.d/keymap.conf": ensure => $keymap, content => "KEYMAP=Y\n", @@ -28,7 +28,7 @@ class nodo::subsystem::initramfs( mode => 0644, } - # update initramfs when needed + # Update initramfs when needed exec { "update-initramfs -v -t -u": subscribe => [ File["/etc/initramfs-tools/modules"], File["/etc/modprobe.d/blacklist"], |