diff options
| -rw-r--r-- | manifests/site.pp | 89 |
1 files changed, 38 insertions, 51 deletions
diff --git a/manifests/site.pp b/manifests/site.pp index 62ed564..05c4b75 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -38,13 +38,13 @@ class ssh_pubkeys_firedadmins { } } -class ssh_pubkeys_backupserver { - ssh_authorized_key { 'root@backup-01': - type => 'ssh-rsa', - key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCyeTFvkidnkU7KO2iBMt+hveUlsJZGOybAO/jMNOW5OETLf+aJLEI6iNaz1k9QukRY09LpWmZe4FY9fqBFWXwNrm7C5ZUmfL0rwIHyu90dAXVvROXXciqvorpsM8vwvsbPOtAuU0i6OLlNoXU5EtB1bsNeDeVOllemzjcBBdA+MH9SZeP1LfWCfZ6r6WDpSRIUHVOVkuwfWIeem/hN1YkKUFTilBpaJEHHIGPriGcWSSYxvSqbt7Eu2JlI7O1Q/PyauYFLpPksMZal4m+jhwsjnkveaM2EPZs6jeaVxhpOQfJJ4zww1d4vta/u3LEBLZnOX9Bn5Uheo0vKSVTnMFLP', - user => 'root', - } -} +#class ssh_pubkeys_backupserver { +# ssh_authorized_key { 'root@backup-01': +# type => 'ssh-rsa', +# key => '<UNKNOWN-PUB-KEY>', +# user => 'root', +# } +#} class anacron_on_battery { file_line { 'anacron-on-battery': @@ -55,12 +55,11 @@ class anacron_on_battery { } class login_manager { - package { 'kdm': - ensure => 'installed', - } package { 'lightdm': - ensure => 'purged', + ensure => 'installed', } + package { 'arctica-greeter': + ensure => 'installed', } @@ -79,18 +78,10 @@ class fsautoresizetab { } } -class fsautoresizetab_change_var { - file_line { '/var': - path => '/etc/fsautoresizetab', - line => '/var 10% 30g defaults', - match => '^/var\ .*', - } -} - class fsautoresizetab_change_usr { file_line { 'usr': path => '/etc/fsautoresizetab', - line => '/usr 10% 30g defaults', + line => '/usr 10% 18g 5%', match => '^/usr\ .*', } } @@ -102,25 +93,25 @@ node "all_hosts" { class { 'login_manager': } class { 'itzks-systems-common': } - # 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", - } +# # 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", +# } } @@ -131,27 +122,23 @@ node "all_servers" { class { 'itzks-systems-common': } } -node "disklserver.intern" inherits "all_servers" { - # vidar.das-netzwerkteam.de is the deployment source for diskless workstation chroots - ssh_authorized_key { 'root@vidar.das-netzwerkteam.de': - type => 'ssh-rsa', - key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDiLGbx/U9slB9db8PAy8FTRo7/avVvLJUOZzkoBxZa5Edeo+74ezoU2Kv1OxcRJRnSGBe41XDcpLxDS04JMA5xBddUfdq5c+Y1A2SYChUPK1fkrGoKfmGC60dFmEqAQZ33dJhN9rxzQvuvxlmexX8x2TYJC8/jATa+6QuO4chHAFvGo9RLs8hzet5y06fammJDkf0yD6R32GT7q4XMNXilKQ564D1yBJygE6vZx/W3V3l8/QMr6m1lYTTk+W+29IkoxvQBZ6YXKFdnuTVkSYyanafjZwznTFSuBtBZKcgLXFFmyplcB4QlZGvdrrsEJazwwj+pnJeGx0HwV8ePbKxN', - user => 'root', - } -} - node "tjener.intern" inherits "all_servers" {} -node "filter.intern" inherits "all_servers" {} +# 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" {} -node "bibserv.intern" inherits "all_servers" { +# NOT PRESENT node "bibserv.intern" inherits "all_servers" { } # Workstations node /workstation-.*\.intern$/ inherits "all_hosts" { class { 'fsautoresizetab': } - class { 'fsautoresizetab_change_var': } + class { 'fsautoresizetab_change_usr': } +} + +# Notebooks +node /notebook-.*\.intern$/ inherits "all_hosts" { + class { 'fsautoresizetab': } class { 'fsautoresizetab_change_usr': } } |