Merge branch 'master' into foo

files/sshd_config

@@ -4,10 +4,6 @@ GSSAPICleanupCredentials yes
 
 UseDNS yes
 
-Match Address cloud.teckids.org,91.184.37.233,2a01:198:10:2800::7 LocalAddress desktop.teckids.org,91.184.37.232,2a01:198:10:2800::3
-	AuthorizedKeysFile .ssh/authorized_keys /etc/ssh/authorized_keys
-	AuthenticationMethods publickey
-
 Match User git
         AuthenticationMethods publickey
 Match User root

packages/essential

@@ -9,13 +9,10 @@ byobu
 ca-certificates
 console-data
 curl
-cvs
 devscripts
 dnsutils
 eatmydata
-ed
 emacs-nox
-fish
 haveged
 htop
 iotop
@@ -55,4 +52,3 @@ wget
 zsh
 zsh-autosuggestions
 zsh-syntax-highlighting
-zsh-theme-powerlevel9k

packages/ltsp-chroot

-firmware-linux
-heimdal-clients
-heimdal-kcm
-initscripts
-krb5-config
-libpam-heimdal
-libsasl2-modules-gssapi-heimdal
-nbd-client
-nfs-common
-plymouth
-plymouth-themes

packages/skole-desktop

-acpi
-adb
-alpine
-arduino
-audacity
-blender
-bpython3
-bucklespring
-build-essential
-bwbasic
-bzflag
-chromium
-clusterssh
-cowsay
-debhelper
-dia
-dino-im
-dosbox
-dspdfviewer
-firefox-esr
-ffmpeg
-figlet
-freecad
-fritzing
-gajim
-gajim-httpupload
-gajim-omemo
-gajim-urlimagepreview
-geogebra
-gimp
-git-extras
-git-hub
-gnucash
-gpsbabel
-graphviz
-handbrake
-idle
-idle3
-imagemagick
-inkscape
-ipython3
-josm
-jpegoptim
-kdenlive
-ldraw-parts
-leocad
-libbsd-dev
-libnxt
-libreoffice
-links
-lynx
-mcabber
-mediathekview
-minetest
-minetest-mod-maidroid
-minetest-mod-mesecons
-minetest-mod-moreblocks
-minetest-mod-moreores
-minetest-mod-nether
-minetest-mod-pipeworks
-minetest-mod-torches
-minetest-mod-worldedit
-mpv
-musescore
-mutt
-nagstamon
-nbc
-nomacs
-nomacs-l10n
-nxt-firmware
-obs-studio
-openshot
-poppler-utils
-psutils
-python3
-python3-pygame
-qmapshack
-qstopmotion
-remmina
-remmina-plugin-rdp
-remmina-plugin-nx
-remmina-plugin-vnc
-scratch
-sonic-pi
-task-german
-task-german-desktop
-task-xfce-desktop
-texlive-full
-thonny
-thunderbird
-tiled
-usbutils
-vlc
-x2goclient
-xfce4
-xfce4-goodies
-xterm

site.yml

@@ -221,15 +221,6 @@
   - name: Install general auditd rules
     copy: src=files/audit-rules.d/teckids-general.rules dest=/etc/audit/rules.d mode=644
     notify: restart auditd
-  - name: Get Icinga PKI ticket from master
-    command: icinga2 pki ticket --cn {{ inventory_hostname }}
-    register: icingaticket
-    delegate_to: monitoring.teckids.org
-  - name: Copy Icinga master cert
-    copy: src=files/icinga-master.crt dest=/tmp/icinga-master.crt mode=644
-#  - name: Configure Icinga node
-#    command: icinga2 node setup --zone {{ inventory_hostname }} --parent_host monitoring.teckids.org --endpoint monitoring.teckids.org --ticket {{ icingaticket.stdout }} --accept-config --accept-commands --trustedcert /tmp/icinga-master.crt creates=/etc/icinga2/pki/{{ inventory_hostname }}.crt
-    notify: restart icinga2
   - name: Ensure log access for nagios
     acl:
       path: /var/log/unattended-upgrades/
@@ -268,6 +259,7 @@
   - name: restart icinga2
     service: name=icinga2 state=restarted
 
+
 - hosts: teckids-hosts:!monitoring.teckids.org
   become: yes
   tasks:

teckids

 [teckids-hosts]
+bbb.teckids.org
+bbb-test.teckids.org
 cloud.teckids.org
 commu-intern.teckids.org
 commu.teckids.org
@@ -12,6 +14,7 @@ jabber01.teckids.org
 jabber02.teckids.org
 lms.teckids.org
 mailfilter.teckids.org
+matrix01.teckids.org
 media.teckids.org
 meet.teckids.org
 monitoring.teckids.org
@@ -41,10 +44,6 @@ ticdesk.teckids.org
 mailfilter.teckids.org
 commu.teckids.org
 
-[rdp-servers]
-
-[ltsp-servers]
-
 [mail-servers]
 commu.teckids.org
 commu-intern.teckids.org