From 83f7ec59fd002874e535d5706bf3f016f54c4137 Mon Sep 17 00:00:00 2001
From: Andreas Schiermeier <as@ccc504j.site>
Date: Mon, 16 Mar 2015 23:17:43 +0100
Subject: [PATCH] Fix errors.

---
 modules/common/manifests/init.pp        | 10 ----------
 modules/common/manifests/users.pp       | 14 +++++++-------
 modules/eventcalendar/manifests/init.pp |  2 +-
 modules/infrateam/manifests/init.pp     |  2 +-
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/modules/common/manifests/init.pp b/modules/common/manifests/init.pp
index 591a5db..579a139 100644
--- a/modules/common/manifests/init.pp
+++ b/modules/common/manifests/init.pp
@@ -1,14 +1,5 @@
 class common {
-
-  # define admin contact mail address
-  
-  # aschiermeier@asl:~$ sudo cat /home/apt-dater/.ssh/authorized_keys
-  # ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAp+P0huFZ8h5GjZhtN2ZzM78pc30u2ZVrbmjLoGq9vYXBk2/jCIEWqg+L63EWg2EZcDsbxuKaf4/CYYnB213FYjhlhi8kvt/Gt3GTOxpf1/vEx+VZWpafeTDiTlKzqDHuFMHe+pEMe/OwIuK561ubttUAk6raixgkjxk0WYQX8HWLrO+jyyXstPmqs6lvQ7TYQajC8HmHb5vQWWSNWdcoeybMY+iD7H6e+4oAINs3yVMJN7Lfso7CySN1eYlFfsKExWJ59U1CrUbOgGfz5K6ommtSUqtxl+DOfmXVO40lpQ8iuTZ3YFZPuVunkw5Ce185DfZhKCSQqr+k+gKy2UFnVw== noc.cash-zone.de
-  # aschiermeier@asl:~$ sudo cat /root/.ssh/authorized_keys
-  # no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="5.231.239.2,::ffff:5.231.239.2" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAygsqWq5lKygdAqO+GZGRB3t2P5FeQO8a3FZHKCOTpiI8CTycDZpiQnc6a/IsTHP4YvqhX9Swofu9jFDlVQXAExvuKmOlg5HZWAlCPxwMRarwN4QJvOowx+zoK0GVh3X/uNzMwKaNtk4GWek64KaLNx3TmO/UNBJhz9MxsUYvzCTTwi7361Nytko3v9BoJOGYLBYwbnseHsu3oLOYThL+KK8gNFuEMuCTIYK5wipbMbtIcCAIlnNrZTFJz0/6fbEj2A59oCeV98JWWYjmoIDqGTR5RflkuTS1LQnd/NlD+vCJdzf81hIBCbYXsy7+wc1bWj9SJuc2Lt91Qaf1DbT9Lw== backuppc@backup01
   
-# apt-dater ALL=NOPASSWD: /usr/bin/apt-get
-
   define set_mountpoint_option($mount, $option) {
     augeas{ "fstab-$mount-$option":
       context => "/files/etc/fstab/*[file = '$mount'][count(opt[. = '$option']) = 0]",
@@ -32,7 +23,6 @@ class common {
   
   $packages = [ 'git-core',
                 'puppet',
-                'sudo',
                 'screen',
                 'rsync',
                 'vim',
diff --git a/modules/common/manifests/users.pp b/modules/common/manifests/users.pp
index 02d6ada..a110b16 100644
--- a/modules/common/manifests/users.pp
+++ b/modules/common/manifests/users.pp
@@ -1,6 +1,6 @@
 class common::users {
 
-  @account { 'mschuster':
+  @common::accountsetup::account { 'mschuster':
     ensure => present,
     comment => 'Markus Schuster',
     uid => 1000,
@@ -8,7 +8,7 @@ class common::users {
     sshkey => 'AAAAB3NzaC1kc3MAAAEBANLHnxKhSkYGfYbL6C801cqoXH4lIfV40ebfiiVEqZkYyQotsi0UHYtpfGXH39yydD7J9mWXu+zypKX4II1CZVk3ohemQVe9NZuvRzVlya2oO+FKLUw86cY65XPak0fIY9pGJuTxMLz7PczmBF53jgpq4e3q6nAaf98hzDfWqp2l6Gw7miLNgsQ2e81znH68IchRPSngjVncTxsUL1ok+Ve/U4WKSGYdB1ATJhnZZ76ug41yxGwKYb5ZwjRFC6Y54r7vg3SOhEu3YQ65KRlbzHoGhAckCFqoyA+Z0S+2e71V/JSbnXf0AdFsRJUfWWBi5HxgCX83XNLRqqrHQ19wZx8AAAAVANa0KMWZaIhiHCcPd5aUXqCXn1onAAABAHzBpd5SmYFTsyFBgiQRBn31KCptzehalZ6whaOY8SyZR4Brqyp3ryaqkww3NdX2D8fQfT2X+ZPKfyFXHl4SyOq5XvvE9qcB/kC2e8JsntJ3yKbWNnMlXPiMYkuTYrrpwilI95Sa2ndH5AnntWy5iBqgny/ElI5qABLfG5ZBkOUEuTVJtYN0qqW9Xupwe5XZjwQ4LpA/SqsdD7Zx8zxXObdzNyXDtm9HpQZ8InmHF8VWzx+HAV/7iF58emLbctbqMrBfsfbb2abwv0KrE/8f8bds+vvP00cYwcH3/+5tie+gkgIThFbO1CAddhpkUKKiTNIwUYQdIUZIb2cbJzwr57YAAAEAfGg4nPZgfL/PjIWRPGlD+VFCzocdS/9z9DpdrumIGr+tVcEE++jkwrkPPiAQiI340K4nFj+iRd/w1Xqo5noColi0USsecTeeC3mFhIWGqvgbro/V574rISGRPnLmSjXxmiZWhMFpMlmF2eMYKL7oNIXttVBMrAK84V3shvu20omHfFbVYdWP7uMN8WLs7LOZ+I3gI+DzLXXMfqCxW+qfkfHXPk62vq+BmARNgDpsExLYRCqG4olhDyoZZQjT3El7/QZVmy5YlhJzeJdXpEJFnBv9Fh1NmrIXz+soKcSo3Pu6AvMmfFR0EYeDqcs19QMpofemnAnHm9BTH9DA94RSMQ==',
   }
   
-  @account { 'phofmann':
+  @common::accountsetup::account { 'phofmann':
     ensure => present,
     comment => 'Pascal Hofmann',
     uid => 1001,
@@ -16,7 +16,7 @@ class common::users {
     sshkey => 'AAAAB3NzaC1yc2EAAAABIwAAAQEA7cWQ6yRH9d4EQv6Om5u6Xa5eXhbNrtEUnQuk408iquJFL22Ok3EvnHAFHycmtbngCR23Cu/TuwkjW9lYq7tO5NLmc+80Kc6WCHZbKX/ST6ShVhm7U49WUtYkx0AC6PJl1MxTWRiNzriRY8zZ+ENTXph27py3mkGgbTzHeiAicP3lhQ/LMYwZzpCJ80vxgKKHvOlVYRA/NXP8YfKA4dQK6AS5ecFK2S0h5J27zFBorO3uLO78hdRdduyF/uzCfEgWud+xXnk8uhe29+twJTS2WF7CnGjuFU3OzHAZEjQK8s3GHFa56QrhTFPdzn9cWnJrRYAB+7lJ7gXEMJBXimoBAw==',
   }
 
-  @account { 'ygoebel':
+  @common::accountsetup::account { 'ygoebel':
     ensure => present,
     comment => 'Yves Goebel',
     uid => 1002,
@@ -24,7 +24,7 @@ class common::users {
     sshkey => 'AAAAB3NzaC1yc2EAAAABIwAAAgEA49yBpOBHpaX4DtrORmmLL18PsnFMB7uDWKjtOGfKPyUdhmhayHmpqFpDojOPOtuceCA5I1VsGL8TnIJHmqCr15fmbCcOuW+LLuraGLQLGiaFOB8ueaQgSjivjxMerSA902RFPrWHI2o7sdYkqfFAsGFSzoULgV4l/6E2Fbx7egf0IxgxRzD9K9bTTyEIGNQtcVAIHxrsisyre94j/Xqh4qwkJWrqhoJJv3iUVenscDxHA01nwVdtVo9z3p53SGVb8kvuyTyVLly2NT3hCoyguAz1t8P/yovQ/6Au+gCi9nvECdhXjtBRAyHzAQKI1ugRL2PDqZuC371URalj6RV5epdU/g2QDLjKE27vTjWb2BPDV2fhdh4cARCGlstzTsMPIx0R/+MnHnj1HcSb0qoLTJXDjVavtmG2LQKUqBs7ll4E6r/gQHIJMew2FXJgcwHHRmGAUi/7XJqdkwu5Axye3RwWm47pIbWWsyEDSY7SiYSc70QCrQl8cjQldBsV9umt7ala2WPRAcm1sSJzvOQX5GSz41YbZJ5XGRAnmW9ZeTN/aum1iqxLdkqYot4vy9Zzc/CRAOtd3Yh2376R3FZepR1rNjRSXSliwNuVFrZoqoRcaQdYRynQDZoXirE50noeuqJe4tPDg1voiOOFRzOYUozYnjdFXXv0B2MCcwLkKt8=',
   }
 
-  @account { 'acoutandin':
+  @common::accountsetup::account { 'acoutandin':
     ensure => present,
     comment => 'Arwed Coutandin',
     uid => 1003,
@@ -33,7 +33,7 @@ class common::users {
     # sshkey => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQDM2nf5wbWoSDGAHRx+1KH1Scmlr62guK3eaaQVl1ts9JdGuoKN8jZxQN+QwXTC6hp+KugSHVacJIya0JWCndRwrUckY7a/2lACzj4E+HXb9mTlgfqA7cQiu1mtl+JBnriNtsKxjQU/C0XpEcR8aSLepOTenQc9DNeMsVkfPt2qAd1LJYskqKgTQC7hgtUmZfSrY5AqS0cvcLqhDZtZ6IGko/bMCnv7hcOPmhxJdpQF6HUnby0EbIOZsftAwRDZvcaGH1qvghp9N312h2eedJCQB6H/Xvz37D5oC7aQReTQ+O9N/75E9frTiVnmM1S20u0m6ZDYXdGGMi36yPY7KJQ4uER1TWHSZT8E+FJVKxDj1NOC16BH4lOMSN+AwR0GJ1NAB6f8SEjsHZjqUWtMov93H27IjnIcwTnarszdiYDasl/+pcL4O54eow+uRZejUauYUvitv4++jzqog9RRQSIXc43Kj4E+TBkPSmPEupyMgTRir5xK4TWrC4BrknN16ouyv4yQ1ZPvLCiuPaNJmVNOMCuQZsjOpBwiLKGt2FTKXg8FCV6UhtbAkgCQZhfrcaGcSJcPl9TzqnA+phKtx1+I/De0O+69K2nwJoj45O1qVuLFTiMwJYwvEbPo4QfUOlSxv5cj99USVpXwQFZ4q8Eyz9/WvXOh2KZdFGpDyEj6wQ==', # arwed@macbookair
   }
 
-  @account { 'aschiermeier':
+  @common::accountsetup::account { 'aschiermeier':
     ensure => present,
     comment => 'Andreas Schiermeier',
     uid => 1004,
@@ -41,7 +41,7 @@ class common::users {
     sshkey => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQCjOdP3+ujw2DNNMBYDkyDlSV4MQ5/fiJwX8d62NvwkxUX0rHbPcoQdnwuHakwRgJs9azE/KIa3PlCw4vd2tBF+WRNcCcA/483FUFAlIuzt8kvopt4X7yxgCL4K5yJsWhn9jTHRaQ0yZEmABLSJ4LO3Fl0m8eAyol4ylLvT/+e+lNskEC4e8CqfEzVTeOUefe62Ick1BbPGu1LyliJIpQ0y/up0deOylbWf7ll5+22wqxF89et7ZS+xKtdzJ/whvFeWlUvSdErYfWwGzYuGx/5HaWklKjXNQ7Y4ulM5OFD2yonnDi+CQzn5wc/VxVIgqDiqZI1hDXdus5GklcBaaXDsYoEImppyL+18aJ5YKX3vAVt5fW6q94yzS9v3sQqUMsKhgoFcdx645txwgfNgqsRNTXG1SgaamH4HEkwkawoSYI/QWcPgWJbwVG9nTkEpRh8/feFv29LMepSQqWGHoXBvz3xphLV5sQgo6U2h4HOuNC3nFa6KdWnllnL7JMEluyKyZSegHytio87RrHkkhsE0NgFvqWGxlTq3016iglAdHsQn5KJUdICY1bOVGnesJjo0AKKUydW/pQJU82h/V+CeBkImzyX+CLXMpJitU0BE2Bq2ZdhpBHlP3DICsPwbTheBcL8AQUaLo9iTiaFk4VnSnj92wLra5YnevP2U3nL3rQ==',
   }
 
-  @account { 'mandre':
+  @common::accountsetup::account { 'mandre':
     ensure => present,
     comment => 'Max Andre',
     uid => 1005,
@@ -49,7 +49,7 @@ class common::users {
     sshkey => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQDNuRDKJUsn8AALnw18GZinTgbIozx9JsKoIOhQqGkQ0npePebqH6CuKM72uzhmp7K/LvTkwQX9C4pCktFJubKiGu3viohp8YtoaiB8KPjAnvg+DVU9DsyuIj8lzgmSuMWHFKGkdvIojQ1Jy2Dnz6LmWU1K2NaRi4iZgIJwTY++RbzcNij1YanqWJu8Gtj5Sw59ulUQqMN6h4/wozFhEcnP63crzgtGU+vAC63Id6gWoaVYj4B1JS9g1HIU6dr6kuKl6JJ/dygqSUhxIWOEn5qBd0Oa19hxRYQq1yYAkIBz6BSMO1S6etu8ibj1xk3yqY++63cuNv+BsetGm2Fs5HBVVvjYg11pLanRt+nL+cMwhyZlI8DeSwhRiIH3QTqS/p8KpR1Bvsuj+aIqAMQzWpjL3ROMUxlIu7MFmwXR1L3+B84DnVHf15QqE1cESeYJVc7qOSbdtv+eAdZIKT2sHk2uYva1g4R93AlZ6LqdD6vZfV3333OOJk8DNYTgzJ1yfA+3VXRvlRuYhFUqXmdcNjOuT7JHbvcD3zmGtcS7o34zqBOpncBAAoDhuObje0qA8QGXRIemzSeeoT6fTIkcHCD9LDkPJUUNL5556b1aHjfgC7ryBb4V/sNofOuG3Azpq+VVc5NG2o0pdNfb4hZVomBe++OkoPuNKBHPysFeicSl4w==',
   }
 
-  @account { 'kwolff':
+  @common::accountsetup::account { 'kwolff':
     ensure => present,
     comment => 'Kris Wolff',
     uid => 1006,
diff --git a/modules/eventcalendar/manifests/init.pp b/modules/eventcalendar/manifests/init.pp
index 6e82e4a..54eea1f 100644
--- a/modules/eventcalendar/manifests/init.pp
+++ b/modules/eventcalendar/manifests/init.pp
@@ -9,7 +9,7 @@ class eventcalendar {
   }
   
   define assigngroups {
-    Common::Users::Account <| title == $name |> {
+    Common::Accountsetup::Account <| title == $name |> {
       groups +> [ 'cal' ],
     }
   }
diff --git a/modules/infrateam/manifests/init.pp b/modules/infrateam/manifests/init.pp
index 277c1dc..0b46889 100644
--- a/modules/infrateam/manifests/init.pp
+++ b/modules/infrateam/manifests/init.pp
@@ -15,7 +15,7 @@ class infrateam {
   }
   
   define assigngroups {
-    Common::Users::Account <| title == $name |> {
+    Common::Accountsetup::Account <| title == $name |> {
       groups +> [ 'sudo', 'adm' ],
     }
   }
-- 
2.11.0