merged

diff --cc class/50-host-classes
index de3b473533712900d00623c28560f13c4930fd56,f7f00093522097526c99ea182c824fcfafc93b57..cca84ce9c1c3e623781403fbd3af1f54225680ff
--- 1/class/50-host-classes
--- 2/class/50-host-classes
+++ b/class/50-host-classes
@@@ -80,12 -77,15 +77,21 @@@ case $HOSTNAME i
      kdev*)
        echo "FAIBASE SYSADMIN KOSA VM MYSQLD PLONE WWW"
        ;;
 +    dcimserver*)
 +      echo "FAIBASE SYSADMIN VM WWW MYSQLD ODCIM"
 +      ;;
 +    irc*)
 +      echo "FAIBASE SYSADMIN KOSA SYSADMIN VM WWW LETSENCRYPT IRC"
 +      ;;
+     glamp*)
+       echo "FAIBASE MYSQLD PHP5 SYSADMIN WWW"
+       ;;
+     gmg*libreplanet.org)
+       echo "FAIBASE VM PSQL GMG SYSADMIN LETSENCRYPT LIBREPLANET"
+       ;;
+     gmg*)
+       echo "FAIBASE VM PSQL GMG SYSADMIN LETSENCRYPT"
+       ;;
      *)  
          echo "FAIBASE"
        ;;