Continued work on NEMS 1.4 adagios

build/010-tty

@@ -1,6 +1,8 @@
 #!/bin/bash
 # Replace the screen with our bootscreen which shows some basic info to the user (like how to connect)
 
+apt install -y dialog
+
 mkdir /etc/systemd/system/getty@tty1.service.d
 systemctl disable getty@tty1.service
 systemctl stop getty@tty1.service

build/055-check_mk

@@ -33,19 +33,17 @@ make
 make install
 cd ..
 
+# Create log for livestatus
+touch /var/log/nagios/livestatus.log
+chown nagios:nagios /var/log/nagios/livestatus.log
+
+systemctl start nagios
+
 # Allow nagvis to read the socket
 chmod 666 /usr/local/nagios/var/rw/live.sock
 
-sleep 5
-
 # /usr/local/nagios/var/rw
 
-systemctl start nagios
-systemctl status nagios
-
-# Create log for livestatus
-touch /var/log/nagios/livestatus.log
-chown nagios:nagios /var/log/nagios/livestatus.log
 
 # ABORT, this doesn't work anymore. Switched to Adagios for NEMS 1.4
 exit

build/180-adagios

@@ -12,7 +12,11 @@ Defaults:%nagios !requiretty
 fi
 
 # Install dependencies
-apt install -y libapache2-mod-wsgi python-simplejson libgmp-dev python-dev python-paramiko python-django
+apt install -y libapache2-mod-wsgi python-simplejson libgmp-dev python-dev python-paramiko
+
+# Install Django
+python -m pip install --upgrade pip setuptools
+pip install Django==1.6
 
 # Install Pynag
 cd /tmp
@@ -21,15 +25,13 @@ cd pynag
 python setup.py build
 python setup.py install
 
-# Install Django
-python -m pip install --upgrade pip setuptools
-pip install Django==1.6
-
 # Install Adagios
 cd /tmp/
 wget -O adagios.tar.gz https://github.com/opinkerfi/adagios/archive/adagios-1.6.3-1.tar.gz
 tar xzf adagios.tar.gz
 cd adagios-adagios-1.6.3-1
+#git clone --branch adagios-1.6.3-2 https://github.com/opinkerfi/adagios
+#cd adagios
 chown -R www-data:www-data adagios
 mv adagios /var/www/
 mv /var/www/adagios/etc/adagios /etc/

build/200-hostname

@@ -3,6 +3,7 @@ hn=$(/bin/hostname)
 printf "Changing Hostname... "
 /bin/sed -i -- 's/'"$hn"'/nems/g' /etc/hosts
 /bin/sed -i -- 's/'"$hn"'/nems/g' /etc/hostname
+hostnamectl set-hostname nems
 echo Done.
 echo Change will take effect at next reboot.