added GMG vars, movved local user script, added nekohost

diff --git a/class/50-host-classes b/class/50-host-classes
index 4ad37282df1687a13a36df0a55191e0d8362acff..700a04489a91a96be9e18d42f3ab030acafe1aa0 100755 (executable)
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -11,18 +11,12 @@ case $HOSTNAME in
     faiserver*)
        echo "FAIBASE FAISERVER SYSADMIN VM"
         ;;
-    demohost)
-        echo "FAIBASE $GRUB DHCPC DEMO" ;;
+    nekohost)
+        echo "FAIBASE $GRUB DHCPC DEMO"
+        ;;
     rms)
-        echo "FAIBASE $GRUB DHCPC DEMO XORG TRISQUEL RMS";;
-    gnomehost)
-        echo "FAIBASE $GRUB DHCPC DEMO XORG GNOME";;
-    atom*)
-        echo "FAIBASE $GRUB DHCPC DEMO" ;;
-    bear)
-        echo "FAIBASE $GRUB DHCPC LVM_XEN_SERVER XEN" ;;
-    puma)
-        echo "FAIBASE $GRUB DHCPC RAID_XEN_VIRTUAL" ;;
+        echo "FAIBASE $GRUB DHCPC DEMO XORG TRISQUEL RMS"
+       ;;
     diskstation*)
        echo "FAIBASE DISKLESS DISKTOOLS SYSADMIN FSF"
         ;;
@@ -86,6 +80,9 @@ case $HOSTNAME in
     glamp*)
        echo "FAIBASE MYSQLD PHP5 SYSADMIN WWW"
        ;;
+    gmg*)
+       echo "FAIBASE VM GMG SYSADMIN"
+       ;;
     *)  
         echo "FAIBASE"
        ;;

diff --git a/class/GMG.var b/class/GMG.var
new file mode 100644 (file)
index 0000000..6bfefbd
--- /dev/null
+++ b/class/GMG.var
@@ -0,0 +1 @@
+GMG_PATH=/srv/gmg

diff --git a/scripts/GMG/00_create_local_user.sh b/scripts/GMG/00_create_local_user.sh
deleted file mode 100755 (executable)
index e07891d..0000000
--- a/scripts/GMG/00_create_local_user.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# Create mediagoblin user & group
-$ROOTCMD sudo useradd -c "GNU MediaGoblin system account" -d /var/lib/mediagoblin -m -r -g nginx mediagoblin
-$ROOTCMD sudo groupadd mediagoblin && sudo usermod --append -G mediagoblin mediagoblin