style fixes

diff --git a/manifests/auth_capable_user.pp b/manifests/auth_capable_user.pp
index bab81f1be79d3eea71a57b02793a9f8addc68e15..497407ccda61cdd65f39dc7a68e26ca6aac33a28 100644 (file)
--- a/manifests/auth_capable_user.pp
+++ b/manifests/auth_capable_user.pp
@@ -2,8 +2,11 @@
 # in the monkeysphere. This is intended to be the same as generated a
 # password-less ssh key 
 #
-define monkeysphere::auth_capable_user ( $expire = "1y", $length = "2048", 
-  $uid_name = undef, $email = undef ) { 
+define monkeysphere::auth_capable_user (
+  $expire = "1y",
+  $length = "2048", 
+  $uid_name = undef,
+  $email = undef ) { 
 
   $user = $title
 

diff --git a/manifests/authorized_user_ids.pp b/manifests/authorized_user_ids.pp
index d400890702d4a85de7b7a3641c015949ee034130..09fd18235e98f6d58abfff0fda430d6b31ba310c 100644 (file)
--- a/manifests/authorized_user_ids.pp
+++ b/manifests/authorized_user_ids.pp
@@ -1,4 +1,9 @@
-define monkeysphere::authorized_user_ids( $user_ids,  $dest_dir = '/root/.monkeysphere', $dest_file = 'authorized_user_ids', $group = '') {
+define monkeysphere::authorized_user_ids(
+  $user_ids,
+  $dest_dir = '/root/.monkeysphere',
+  $dest_file = 'authorized_user_ids',
+  $group = '') {
+
   $user = $title
   $calculated_group = $group ? {
     '' => $user,

diff --git a/manifests/import_key.pp b/manifests/import_key.pp
index ec00feeac995f62e8f0c53fcaba7925ce1f3a89a..ba965ce985fc007a8f7d647758c5ec42dc4b4302 100644 (file)
--- a/manifests/import_key.pp
+++ b/manifests/import_key.pp
@@ -1,4 +1,8 @@
-define monkeysphere::import_key ( $scheme = 'ssh://', $port = '', $path = '/etc/ssh/ssh_host_rsa_key', $hostname = $fqdn ) {
+define monkeysphere::import_key (
+  $scheme = 'ssh://',
+  $port = '',
+  $path = '/etc/ssh/ssh_host_rsa_key',
+  $hostname = $fqdn ) {
 
   # if we're getting a port number, prefix with a colon so it's valid
   $prefixed_port = $port ? {
@@ -10,7 +14,7 @@ define monkeysphere::import_key ( $scheme = 'ssh://', $port = '', $path = '/etc/
 
   exec { "monkeysphere-host import-key $path $key":
     alias => "monkeysphere-import-key",
-         require => [ Package["monkeysphere"],  File["monkeysphere_host_conf"] ],
-         unless => "/usr/sbin/monkeysphere-host s | grep $key > /dev/null"
+    require => [ Package["monkeysphere"],  File["monkeysphere_host_conf"] ],
+    unless => "/usr/sbin/monkeysphere-host s | grep $key > /dev/null"
   }
 }

diff --git a/manifests/init.pp b/manifests/init.pp
index 4d48ed30fdc76c0da4b6cb39f83f2b381aa9e2b3..30035beaa81f682bed668e727a9e7f767987aa92 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -27,41 +27,39 @@ class monkeysphere(
   $keyserver      = 'pool.sks-keyservers.net'
 ) {
   # The needed packages
-  package{'monkeysphere':
+  package { 'monkeysphere':
     ensure => $ensure_version,
   }
 
   $key = "ssh://${::fqdn}${port}"
 
   common::module_dir { [ 'monkeysphere', 'monkeysphere/hosts', 'monkeysphere/plugins' ]: }
-  # This was the old way which the module checked monkeysphere keys
-  file { "/usr/local/sbin/monkeysphere-check-key":
-    ensure  => absent,
-    owner   => root,
-    group   => root,
-    mode    => 0755,
-    content => "#!/bin/bash\n/usr/bin/gpg --homedir /var/lib/monkeysphere/host --list-keys '=$key' &> /dev/null || false",
-  }
 
-  file { "monkeysphere_conf":
-    path => "/etc/monkeysphere/monkeysphere.conf",
-    mode => 644,
-    ensure => present,
-    content => template("monkeysphere/monkeysphere.conf.erb"),
-    require => Package['monkeysphere'],
-  }
-  file { "monkeysphere_host_conf":
-    path => "/etc/monkeysphere/monkeysphere-host.conf",
-    mode => 644,
-    ensure => present,
-    content => template("monkeysphere/monkeysphere-host.conf.erb"),
-    require => Package['monkeysphere'],
-  }
-  file { "monkeysphere_authentication_conf":
-    path => "/etc/monkeysphere/monkeysphere-authentication.conf",
-    mode => 644,
-    ensure => present,
-    content => template("monkeysphere/monkeysphere-authentication.conf.erb"),
-    require => Package['monkeysphere'],
+  file {
+    # This was the old way which the module checked monkeysphere keys
+    '/usr/local/sbin/monkeysphere-check-key':
+      ensure  => absent,
+      owner   => root,
+      group   => root,
+      mode    => 0755,
+      content => "#!/bin/bash\n/usr/bin/gpg --homedir /var/lib/monkeysphere/host --list-keys '=$key' &> /dev/null || false";
+    'monkeysphere_conf':
+      path => '/etc/monkeysphere/monkeysphere.conf',
+      mode => 644,
+      ensure => present,
+      content => template('monkeysphere/monkeysphere.conf.erb'),
+      require => Package['monkeysphere'];
+    'monkeysphere_host_conf':
+      path => '/etc/monkeysphere/monkeysphere-host.conf',
+      mode => 644,
+      ensure => present,
+      content => template('monkeysphere/monkeysphere-host.conf.erb'),
+      require => Package['monkeysphere'];
+    'monkeysphere_authentication_conf':
+      path => '/etc/monkeysphere/monkeysphere-authentication.conf',
+      mode => 644,
+      ensure => present,
+      content => template('monkeysphere/monkeysphere-authentication.conf.erb'),
+      require => Package['monkeysphere'];
   }
 }

diff --git a/manifests/owner_trust.pp b/manifests/owner_trust.pp
index 765a1f83f6cbe2658fd9a7e7b3d74335a5f45294..0e0af7f27650184e52a6a671eae384bd6409549f 100644 (file)
--- a/manifests/owner_trust.pp
+++ b/manifests/owner_trust.pp
@@ -1,4 +1,8 @@
-define monkeysphere::owner_trust( $fingerprint, $user = 'root', $level = 6 ) {
+define monkeysphere::owner_trust (
+  $fingerprint,
+  $user = 'root',
+  $level = 6 ) {
+
   $keyserver_arg = $monkeysphere_keyserver ? {
     '' => '',
     default => "--keyserver $monkeysphere_keyserver"

diff --git a/manifests/publish_server_keys.pp b/manifests/publish_server_keys.pp
index 81e32aa78ba4bb45f6a4611a53091a6419f54f54..33e070e7e3f72d8de4a45fe9350d771a334faa9c 100644 (file)
--- a/manifests/publish_server_keys.pp
+++ b/manifests/publish_server_keys.pp
@@ -2,6 +2,6 @@
 define monkeysphere::publish_server_keys ( $keyid = '--all' ) { 
   exec { "monkeysphere-host publish-keys $keyid":
     environment => "MONKEYSPHERE_PROMPT=false",
-         require => [ Package["monkeysphere"], Exec["monkeysphere-import-key"], File["monkeysphere_host_conf"] ],
+    require => [ Package["monkeysphere"], Exec["monkeysphere-import-key"], File["monkeysphere_host_conf"] ];
   }
 }