diff options
| -rw-r--r-- | code/environments/production/manifests/site.pp (renamed from manifests/site.pp) | 88 |
1 files changed, 55 insertions, 33 deletions
diff --git a/manifests/site.pp b/code/environments/production/manifests/site.pp index cbbaba6..2488b47 100644 --- a/manifests/site.pp +++ b/code/environments/production/manifests/site.pp @@ -60,28 +60,28 @@ class login_manager { } package { 'arctica-greeter': ensure => 'installed', + } } - -class itzks-systems-common { +class itzks_systems_common { package { 'itzks-systems-common': ensure => 'latest', } } -class itzks-systems-workstation { - package { 'itzks-systems-workstations': +class itzks_systems_workstation { + package { 'itzks-systems-workstation': ensure => 'latest', } } -class itzks-systems-mainserver { +class itzks_systems_mainserver { package { 'itzks-systems-mainserver': ensure => 'latest', } } -class itzks-systems-terminalserver { +class itzks_systems_terminalserver { package { 'itzks-systems-terminalserver': ensure => 'latest', } @@ -101,17 +101,35 @@ class fsautoresizetab_change_usr { path => '/etc/fsautoresizetab', line => '/usr 10% 18g 5%', match => '^/usr\ .*', - before => Exec['fsautoresizetab'], + require => File["/etc/fsautoresizetab"], } } +node "tjener.intern" { + + class { 'ssh_pubkeys_admins': } + class { 'ssh_pubkeys_firedadmins': } + class { 'ssh_pubkeys_backupserver': } + class { 'itzks_systems_common': } + + class { 'itzks_systems_mainserver': } + class { 'itzks_systems_terminalserver': } +} +# NOT PRESENT node "filter.intern" inherits "all_servers" {} +# NOT PRESENT node "opsiserver.intern" inherits "all_servers" {} +# NOT PRESENT node "displayserver.intern" inherits "all_servers" {} +# NOT PRESENT node "contentserver.intern" inherits "all_servers" {} +# NOT PRESENT node "devserver.intern" inherits "all_servers" {} +# NOT PRESENT node "bibserv.intern" inherits "all_servers" { + +# Workstations +node /workstation-.*\.intern$/ { -node "all_hosts" { class { 'ssh_pubkeys_admins': } class { 'ssh_pubkeys_firedadmins': } class { 'login_manager': } - class { 'itzks-systems-common': } - class { 'itzks-systems-workstation': } + class { 'itzks_systems_common': } + class { 'itzks_systems_workstation': } # # settings appropriate for workstation hosts # class { 'apt::unattended_upgrades': @@ -133,35 +151,39 @@ node "all_hosts" { # download_delta => "1", # } + class { 'fsautoresizetab': } + class { 'fsautoresizetab_change_usr': } } -node "all_servers" { +# Notebooks +node /notebook-.*\.intern$/ { + class { 'ssh_pubkeys_admins': } class { 'ssh_pubkeys_firedadmins': } - class { 'ssh_pubkeys_backupserver': } - class { 'itzks-systems-common': } -} - -node "tjener.intern" inherits "all_servers" { - class { 'itzks-systems-mainserver': } - class { 'itzks-systems-terminalserver': } -} -# NOT PRESENT node "filter.intern" inherits "all_servers" {} -# NOT PRESENT node "opsiserver.intern" inherits "all_servers" {} -# NOT PRESENT node "displayserver.intern" inherits "all_servers" {} -# NOT PRESENT node "contentserver.intern" inherits "all_servers" {} -# NOT PRESENT node "devserver.intern" inherits "all_servers" {} -# NOT PRESENT node "bibserv.intern" inherits "all_servers" { -} + class { 'login_manager': } + class { 'itzks_systems_common': } + class { 'itzks_systems_workstation': } -# Workstations -node /workstation-.*\.intern$/ inherits "all_hosts" { - class { 'fsautoresizetab': } - class { 'fsautoresizetab_change_usr': } -} +# # settings appropriate for workstation hosts +# class { 'apt::unattended_upgrades': +# origins => [ +# 'o=Debian,n=${distro_codename}', +# 'o=Debian,n=${distro_codename}-updates', +# 'o=Debian,n=${distro_codename},l=Debian-Security', +# 'o=IT-Zukunft Schule,n=${distro_codename},l=IT-Zukunft Schule', +# ], +# update => "1", +# download => "1", +# upgrade => "1", +# autoclean => "7", +# auto_fix => true, +# minimal_steps => true, +# install_on_shutdown => false, +# remove_unused => true, +# auto_reboot => false, +# download_delta => "1", +# } -# Notebooks -node /notebook-.*\.intern$/ inherits "all_hosts" { class { 'fsautoresizetab': } class { 'fsautoresizetab_change_usr': } } |