move accounts to ff_gw::sysadmin

This commit is contained in:
Martin Schuette 2014-05-04 23:38:58 +02:00
parent 1c21f4b49e
commit d407821cf3
2 changed files with 6 additions and 5 deletions

View file

@ -53,10 +53,8 @@ class { 'ff_gw::sysadmin':
# both optional, used for FFHH monitoring: # both optional, used for FFHH monitoring:
zabbixserver => 'argos.mschuette.name', zabbixserver => 'argos.mschuette.name',
muninserver => '78.47.49.236', muninserver => '78.47.49.236',
}
class { 'ff_gw': # also optional, let puppet control user accounts:
# user accounts:
accounts => { accounts => {
mschuett => { mschuett => {
comment => 'Martin Schuette', comment => 'Martin Schuette',
@ -64,7 +62,9 @@ class { 'ff_gw':
groups => ['sudo', 'users'], groups => ['sudo', 'users'],
} }
}, },
}
class { 'ff_gw':
# freifunk config # freifunk config
# the network assigned to the ff community # the network assigned to the ff community
ff_net => '10.112.0.0/16', ff_net => '10.112.0.0/16',

View file

@ -1,6 +1,5 @@
# kitchen sink class for various small settings # 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 # use Hiera as a Puppet data source
file { file {
'/etc/puppet/hiera.yaml': '/etc/puppet/hiera.yaml':
@ -24,6 +23,8 @@ class ff_gw::sysadmin($zabbixserver = '127.0.0.1', $muninserver = '127.0.0.1') {
ensure => installed, ensure => installed,
} }
# user accounts
create_resources('account', $accounts)
# Sudo # Sudo
include sudo include sudo
sudo::conf { 'admins': sudo::conf { 'admins':