summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-07-10 07:48:22 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-07-10 07:48:22 +0200
commit46ace038e0134483ddabe9636e8236aea2f460ff (patch)
tree63649e3f1201c8cbd5ce7c8dc9bbfb12c0372515
parent51411010081f0b6c218d27fc3d23011a14e2b2da (diff)
downloadpuppet.FWSECK-46ace038e0134483ddabe9636e8236aea2f460ff.tar.gz
puppet.FWSECK-46ace038e0134483ddabe9636e8236aea2f460ff.tar.bz2
puppet.FWSECK-46ace038e0134483ddabe9636e8236aea2f460ff.zip
adapt for Debian 11 roaming workstation notebooks
-rw-r--r--code/environments/production/manifests/site.pp111
1 files changed, 64 insertions, 47 deletions
diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp
index 31d42e9..983ad08 100644
--- a/code/environments/production/manifests/site.pp
+++ b/code/environments/production/manifests/site.pp
@@ -14,16 +14,10 @@ class ssh_pubkeys_admins {
key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDn2moKR4u3yJW+/hvwmhUDjiLBxiMPB+46YO9iEo8HXsdulpMi20hi2TTmWA0w3hog1IEnre6C7UGHcZG0HfPg+eROIuuXRcOfg3WP/IBV0KMF4DTa1KDoN/Nw7HMlhWxGxFrdbumAoj/s2ZaA/of1fpaPKOhunF8S9Ch60LYmgnR3tzJW/b0jS9fww8o/rMB3pZy2WSW0uUfpOIbDv+XHhNiC/iu8IgD+M5KkK+qbNZFPoTQkebc0RPRBcOrmEYroofFGg+7jPU++AEKJUKSaGjZRWzACuXiUzTo2F9fT09EMWU4oiYV9zRqjx6ctncwfEB4qOfoRUycfxBSJk7t7',
user => 'root',
}
- # Marcel Sandow, IT-Zukunft Schule
- ssh_authorized_key { 'marcel@Bigblue':
+# Daniel Teichmann, DAS-NETZWERKTEAM
+ ssh_authorized_key { ' daniel@nwt-01':
type => 'ssh-rsa',
- key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQD3RPZTCJNjuV2vq8cO6AwPaVcjimg2DgRi2GitC/K4HzQuy0+RswVktyBACKpFogx254S1gjGoueYDfHq+T4hdoBussGln0MEsJKbEPEgWpGUZgurg3eWSAlzAWlhf9Goy5ZA362sOz3NsbY3DE+4CqxQWth+CctpGz1WzAvFy0K7oclfoncbOlftgEUukvKqJtSapxNAb+O+Ijjur/yaXKwk/dK7T+ZTPhZwChlxo50kLuiN8d3TYgFxc19LncJxq6s8BqQs70Z6m1CNHA07t6UD01Pto29TRNZfAnjuAP8FiO9Cu06cUnHrwlG2jgvr5hA0rLFYnVtgGaQX6RCsT',
- user => 'root',
- }
- # Benjamin Schlüter, LOGO EDV-Systeme GmbH
- ssh_authorized_key { 'benni@nbbenni':
- type => 'ssh-rsa',
- key => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQCy2oN7DNtxUXsKUEOsQiUWW9fupzVJAuoaGe3OWxlcZN1je9EpObfHEn5HuYJFcBgHK6PSapPIOJ9QXbLsUYX5vhQwx9oBOg7W8He0kNscO23kjVOLJGaebGX5zNpf96RjZIy/Jhwlb73hCMqTTdp+D3/VDIm7q1UbMn2KOl9ldGwPJCxppeBeHdr89CED1RX/XAXt69qknrC1wm1NXp+UGz9FaG9YWJPNrFXBBvrGCt1oUrB8bXo/poo+doIuVmMqvN0e7lBDOzsRIiorDEk/cFc+ZOUBn4QOeY7J7keX6l2v3AxRXq6ErZrX+ooa83duRGXj2HkNWufmAi0CqzeXqGFIw+9S9vextn/zCp15G737cruJ50nX5jK38I9fnf3rfGveYdGuf3ta3Eihw1QiK/J4DQeTFKscsR4+P/iRcnsFO4/aVgDbOtCeKIaLK0fh9JWa/H2NVaLWvYv7beDoPtZ7I8TW+SsnO6mykmqUg679fcA/ZTIoAfLfK99UDiOhpye0EtWxGMiBBHn0V1RbERNjfHEVcBnlvcnPRIqkfwOEK5bASXpzzPvEuEGkFlHhtuXQ6WoWdA8zCq+lakNLYeq8CemU9Hd20JgILOidP4Yt9yNuusTP/EDg0AN9fggQe/rc1Raui/5/rVgkzqYFp8DMbgFAAcBTqsBCh1GVDQ==',
+ key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCytDYygwrARkiy/1cQ8x9otmWgE3k6EH3ymeHXaFnP/Du0BDRgGuLtdL1yj4OqE4tKqKdXOa1kULLQdbQ0C0ogGGxpZaza1TdxKTpB2YSx1L3LjhzG4KSr0hz/u9qpk7U1PVRi5N7tO/x7eRZWzbuH5UXxLemb1jj5X+q/siAi+8rFfmQmYta+ea4XDQIjfMiKU5ExGjg3DufhyPtsb75zsU9ZcoXo8j4lkjeCJegK7rdKrlmZqMidrZHd8pPN5Tjrn0LMg1fRL0Z+wwHxawhruaw+LHq2iJ3plWJ9igCwvUcXY3KtL1r9owxZATE5CN17OFxCbEFDqsS63OTYr3Xt',
user => 'root',
}
}
@@ -43,6 +37,20 @@ class ssh_pubkeys_firedadmins {
key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCuoOfxXovfHlODw7dDlfcLKHaD7fotGT5Kb/HADNQY+GMINKy9Zu71/qpjVZtrckLl92nS7ygCf7+KpyfihdJgKBIeacikD4Y8/slDA2AbBuTZsHOp9HEzopmE1DbJbjeFtnjv8usPx/zB0buEtXy7Fa+bMIu6gIDIK7pO83kqiI/uv1sDyyaElw50Hn8tvZg7OtVHuShxjRCZVDolqUKBDDrQ+lZQG24XeMrQ4cEZ9yLYNAeeLwqqiWqnQ0jrCf2JYI4V7Oo1tvjKJM8HiVFSjsPh8cEu5iLBi08fuKCR7p1efSTOsy06HeraZpWJw5MH+At7sy3qjuuJ0oftrg3n',
user => 'root',
}
+ # Marcel Sandow, IT-Zukunft Schule
+ ssh_authorized_key { 'marcel@Bigblue':
+ ensure => 'absent',
+ type => 'ssh-rsa',
+ key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQD3RPZTCJNjuV2vq8cO6AwPaVcjimg2DgRi2GitC/K4HzQuy0+RswVktyBACKpFogx254S1gjGoueYDfHq+T4hdoBussGln0MEsJKbEPEgWpGUZgurg3eWSAlzAWlhf9Goy5ZA362sOz3NsbY3DE+4CqxQWth+CctpGz1WzAvFy0K7oclfoncbOlftgEUukvKqJtSapxNAb+O+Ijjur/yaXKwk/dK7T+ZTPhZwChlxo50kLuiN8d3TYgFxc19LncJxq6s8BqQs70Z6m1CNHA07t6UD01Pto29TRNZfAnjuAP8FiO9Cu06cUnHrwlG2jgvr5hA0rLFYnVtgGaQX6RCsT',
+ user => 'root',
+ }
+ # Benjamin Schlüter, LOGO EDV-Systeme GmbH
+ ssh_authorized_key { 'benni@nbbenni':
+ ensure => 'absent',
+ type => 'ssh-rsa',
+ key => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQCy2oN7DNtxUXsKUEOsQiUWW9fupzVJAuoaGe3OWxlcZN1je9EpObfHEn5HuYJFcBgHK6PSapPIOJ9QXbLsUYX5vhQwx9oBOg7W8He0kNscO23kjVOLJGaebGX5zNpf96RjZIy/Jhwlb73hCMqTTdp+D3/VDIm7q1UbMn2KOl9ldGwPJCxppeBeHdr89CED1RX/XAXt69qknrC1wm1NXp+UGz9FaG9YWJPNrFXBBvrGCt1oUrB8bXo/poo+doIuVmMqvN0e7lBDOzsRIiorDEk/cFc+ZOUBn4QOeY7J7keX6l2v3AxRXq6ErZrX+ooa83duRGXj2HkNWufmAi0CqzeXqGFIw+9S9vextn/zCp15G737cruJ50nX5jK38I9fnf3rfGveYdGuf3ta3Eihw1QiK/J4DQeTFKscsR4+P/iRcnsFO4/aVgDbOtCeKIaLK0fh9JWa/H2NVaLWvYv7beDoPtZ7I8TW+SsnO6mykmqUg679fcA/ZTIoAfLfK99UDiOhpye0EtWxGMiBBHn0V1RbERNjfHEVcBnlvcnPRIqkfwOEK5bASXpzzPvEuEGkFlHhtuXQ6WoWdA8zCq+lakNLYeq8CemU9Hd20JgILOidP4Yt9yNuusTP/EDg0AN9fggQe/rc1Raui/5/rVgkzqYFp8DMbgFAAcBTqsBCh1GVDQ==',
+ user => 'root',
+ }
}
#class ssh_pubkeys_backupserver {
@@ -103,20 +111,20 @@ class browsers {
package { chromium:
ensure => 'latest',
}
- $flashplayer_mozilla_package = $::operatingsystemrelease ? {
- /(?i:8\..*)/ => 'hello',
- default => 'flashplayer-mozilla',
- }
- package { $flashplayer_mozilla_package:
- ensure => 'latest',
- }
- $flashplayer_chromium_package = $::operatingsystemrelease ? {
- /(?i:8\..*)/ => 'hello',
- default => 'flashplayer-chromium',
- }
- package { $flashplayer_chromium_package:
- ensure => 'latest',
- }
+# $flashplayer_mozilla_package = $::operatingsystemrelease ? {
+# /(?i:8\..*)/ => 'hello',
+# default => 'flashplayer-mozilla',
+# }
+# package { $flashplayer_mozilla_package:
+# ensure => 'latest',
+# }
+# $flashplayer_chromium_package = $::operatingsystemrelease ? {
+# /(?i:8\..*)/ => 'hello',
+# default => 'flashplayer-chromium',
+# }
+# package { $flashplayer_chromium_package:
+# ensure => 'latest',
+# }
}
class cachefilesd {
@@ -143,6 +151,15 @@ class itzks_systems_workstation {
}
}
+class itzks_systems_roaming_workstation {
+ package { 'itzks-systems-roaming-workstation':
+ ensure => 'latest',
+ }
+ package { 'nscd':
+ ensure => 'purged',
+ }
+}
+
class itzks_systems_mainserver {
package { 'itzks-systems-mainserver':
ensure => 'latest',
@@ -279,7 +296,7 @@ node /workstation-.*\.intern$/ {
}
# Notebooks
-node /(portfolio-nb-.*|notebook-.*)\.intern$/ {
+node /(notebook-.*)\.intern$/ {
class { 'anacron_on_battery': }
@@ -287,21 +304,21 @@ node /(portfolio-nb-.*|notebook-.*)\.intern$/ {
class { 'ssh_pubkeys_firedadmins': }
class { 'login_manager': }
class { 'itzks_systems_common': }
- class { 'itzks_systems_workstation': }
+ class { 'itzks_systems_roaming_workstation': }
class { 'fsautoresizetab': }
class { 'fsautoresizetab_change_usr': }
class { 'lsb_release_with_version': }
- class { 'unattended_upgrades':
- enable => 1,
- origins => $apt_origins,
- auto => {
- 'clean' => 7,
- },
- upgradeable_packages => {
- download_only => 1,
- debdelta => 1,
- },
- }
+# class { 'unattended_upgrades':
+# enable => 1,
+# origins => $apt_origins,
+# auto => {
+# 'clean' => 7,
+# },
+# upgradeable_packages => {
+# download_only => 1,
+# debdelta => 1,
+# },
+# }
class { 'browsers': }
class { 'cachefilesd': }
}
@@ -311,15 +328,15 @@ node "default" {
class { 'ssh_pubkeys_admins': }
class { 'ssh_pubkeys_firedadmins': }
class { 'lsb_release_with_version': }
- class { 'unattended_upgrades':
- enable => 1,
- origins => $apt_origins,
- auto => {
- 'clean' => 7,
- },
- upgradeable_packages => {
- download_only => 1,
- debdelta => 1,
- },
- }
+# class { 'unattended_upgrades':
+# enable => 1,
+# origins => $apt_origins,
+# auto => {
+# 'clean' => 7,
+# },
+# upgradeable_packages => {
+# download_only => 1,
+# debdelta => 1,
+# },
+# }
}