move accounts to ff_gw::sysadmin
This commit is contained in:
parent
1c21f4b49e
commit
d407821cf3
|
@ -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',
|
||||
|
|
|
@ -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':
|
||||
|
|
Loading…
Reference in a new issue