Issue 122 - Puppet ENC via Hiera

modules/base/manifests/init.pp

-class base ($authority='adblockplus.org') {
+class base ($zone='adblockplus.org') {
   stage {'pre': before => Stage['main']}
   stage {'post': require => Stage['main']}
 
   class {'users':
     stage => 'pre',
   }
 
   class {'apt':
     always_apt_update => true
   }
@@ skipping 21 matching lines @@
 
   service {'cron':
     ensure => running,
     enable => true,
   }
 
   class {'logrotate':
     stage => 'post'
   }
 
-  $servers = hiera("servers")
+  $servers = hiera('servers')
   create_resources(base::explicit_host_record, $servers)
 
-  define explicit_host_record($ip, $ssh_public_key=undef, $role=undef, $dns=undef) {
+  define explicit_host_record(
+    $ip,
+    $ssh_public_key = undef,
+    $role           = undef,
+    $dns            = undef,
+    $groups         = undef,
+  ) {
     
     if is_array($ip) {
       $internal_ip = $ip[0]
     } else {
       $internal_ip = $ip
     }
 
-    $fqdn_name = join([$name, $authority], ".")
+    $fqdn_name = join([$name, $base::zone], '.')
     
-    host{"$name,$internal_ip":

[Wladimir Palant, 2014/11/17 16:43:36]

Given that each name is resolved to a single IP address, host{$name: should do
just fine.

[mathias, 2014/11/27 00:30:18]

Done.

+    host{$name:
       ensure => present,
       ip => $internal_ip,
       name => $fqdn_name,
       host_aliases => $dns ? {
         undef => [],
         default => $dns,
       }  
     }
 
     if $ssh_public_key != undef {
 
       $name_key = $dns ? {
         undef => $fqdn_name,
         default => $dns,
       }
 
       @sshkey {$name:
         name => $name_key,
         key => $ssh_public_key,
         type => ssh-rsa,
         host_aliases => $ip,
       }
     }
 
   }
 }