Merge branch 'master' into sudoman-mods

[fai-configs.git] / class / 50-host-classes

diff --git a/class/50-host-classes b/class/50-host-classes
index 4b47f5099c4791907a83526bc9f718cb1cf782d5..9d5257b22b4a3c60e044354a40475afb510ddb8f 100755 (executable)
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -35,6 +35,9 @@ case $HOSTNAME in
     freestation*)
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF"
         ;;
     freestation*)
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF"
         ;;

+    zoneminder*)
+       echo "FAIBASE DISKLESS SYSADMIN FSF SYSADMIN ZONEMINDER"
+        ;;

     freetop-x60*)
        echo "FAIBASE $GRUB NW_MGR XORG TRISQUEL WORKSTATION FSF"
        ;;
     freetop-x60*)
        echo "FAIBASE $GRUB NW_MGR XORG TRISQUEL WORKSTATION FSF"
        ;;


@@ -69,11 +72,14 @@ case $HOSTNAME in
        echo "FAIBASE WWW CIVICRM SYSADMIN VM MYSQLD"
        ;;
     gnusocial*)
        echo "FAIBASE WWW CIVICRM SYSADMIN VM MYSQLD"
        ;;
     gnusocial*)

-       echo "FAIBASE WWW SYSADMIN VM MYSQLD"
+       echo "FAIBASE WWW SYSADMIN VM MYSQLD GNUSOCIAL YOURLS"

        ;;
     nagios*)
        echo "FAIBASE SYSADMIN VM MYSQLD NAGIOS WWW"
        ;;
        ;;
     nagios*)
        echo "FAIBASE SYSADMIN VM MYSQLD NAGIOS WWW"
        ;;

+    shopserver*)
+       echo "FAIBASE SYSADMIN KOSA MARIADB WWW"
+       ;;

     kdev*)
        echo "FAIBASE SYSADMIN KOSA VM MYSQLD PLONE WWW"
        ;;
     kdev*)
        echo "FAIBASE SYSADMIN KOSA VM MYSQLD PLONE WWW"
        ;;