From d407821cf3897b384c38fde4fd62b38ba2c5e5f2 Mon Sep 17 00:00:00 2001
From: Martin Schuette <info@mschuette.name>
Date: Sun, 4 May 2014 23:38:58 +0200
Subject: [PATCH] move accounts to ff_gw::sysadmin

---
 README.md             | 6 +++---
 manifests/sysadmin.pp | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 69eddec..271f5dd 100644
--- a/README.md
+++ b/README.md
@@ -53,10 +53,8 @@ class { 'ff_gw::sysadmin':
     # both optional, used for FFHH monitoring:
     zabbixserver => 'argos.mschuette.name',
     muninserver  => '78.47.49.236',
-}
 
-class { 'ff_gw':
-    # user accounts:
+    # also optional, let puppet control user accounts:
     accounts => {
         mschuett => {
             comment => 'Martin Schuette',
@@ -64,7 +62,9 @@ class { 'ff_gw':
             groups => ['sudo', 'users'],
         }
     },
+}
 
+class { 'ff_gw':
     # freifunk config
     # the network assigned to the ff community
     ff_net          => '10.112.0.0/16',
diff --git a/manifests/sysadmin.pp b/manifests/sysadmin.pp
index fc06b7f..6f642e1 100644
--- a/manifests/sysadmin.pp
+++ b/manifests/sysadmin.pp
@@ -1,6 +1,5 @@
 # kitchen sink class for various small settings
-class ff_gw::sysadmin($zabbixserver = '127.0.0.1', $muninserver = '127.0.0.1') {
-
+class ff_gw::sysadmin($zabbixserver = '127.0.0.1', $muninserver = '127.0.0.1', $accounts = {}) {
   # use Hiera as a Puppet data source
   file {
     '/etc/puppet/hiera.yaml':
@@ -24,6 +23,8 @@ class ff_gw::sysadmin($zabbixserver = '127.0.0.1', $muninserver = '127.0.0.1') {
       ensure => installed,
   }
 
+  # user accounts
+  create_resources('account', $accounts)
   # Sudo
   include sudo
   sudo::conf { 'admins':