Permalink
Browse files

Move bootscreen to TTY7

  • Loading branch information...
NEMS Linux
NEMS Linux committed Feb 8, 2019
1 parent 31e2614 commit bf7b57e54010c607e86aa3f783e3280faad3e7ec
Showing with 15 additions and 11 deletions.
  1. +13 −9 fixes.sh
  2. +2 −2 stats.sh
@@ -286,7 +286,10 @@ if (( $(awk 'BEGIN {print ("'$ver'" >= "'1.4.1'")}') )); then
/usr/local/share/nems/nems-scripts/benchmark.sh
fi

# Can move all this stuff to 1.4.1 once 1.5 releases
fi

if (( $(awk 'BEGIN {print ("'$ver'" >= "'1.5'")}') )); then

# Give Adagios access to socket
/bin/sed -i -- 's,livestatus_path = None,livestatus_path = "/usr/local/nagios/var/rw/live.sock",g' /var/www/adagios/settings.py

@@ -315,14 +318,7 @@ if (( $(awk 'BEGIN {print ("'$ver'" >= "'1.4.1'")}') )); then
chown www-data:www-data /var/www/adagios/settings.py
adagioscache=1;
fi
# DISABLED and REVERSED. If user renamed admin user in NConf, Adagios would be empty.
# if ! grep -q "NEMS00000" /etc/adagios/adagios.conf; then
# echo "
## NEMS00000 A hacky way of disabling the admin portions of Adagios
#enable_authorization=True
#administrators=\"nobodyisadmin\"
#" >> /etc/adagios/adagios.conf
# fi

if ! grep -q "NEMS00000" /var/www/adagios/templates/403.html; then
cp -f /root/nems/nems-migrator/data/1.4/adagios/templates/403.html /var/www/adagios/templates/
adagioscache=1;
@@ -340,8 +336,16 @@ if (( $(awk 'BEGIN {print ("'$ver'" >= "'1.4.1'")}') )); then
/bin/systemctl restart apache2
fi

# Move bootscreen to TTY7 and disable TTY1
if ! grep -q "NEMS00001" /etc/rc.local; then
/root/nems/nems-admin/build/010-tty
fi

fi




if (( $(awk 'BEGIN {print ("'$ver'" <= "'1.3.1'")}') )); then
/usr/local/share/nems/nems-scripts/fixes-legacy.sh
fi
@@ -27,7 +27,7 @@ while ($socketstatus != 1) {
$output = date('r') . PHP_EOL;
$load = sys_getloadavg();
$output .= 'LA: ' . $load[0] . PHP_EOL;
$output .= 'Sending anonymous stats to https://nemslinux.com/stats/' . PHP_EOL;
$output .= 'Sending anonymous stats to https://new.nemslinux.com/stats/' . PHP_EOL;
file_put_contents('/var/log/nems/stats.log',$output,FILE_APPEND);
if (file_exists('/var/log/nems/hw_model')) { // Don't run this until system is ready to report true stats
@@ -93,7 +93,7 @@ if (file_exists('/var/log/nems/hw_model')) { // Don't run this until system is r
}
}
$ch = curl_init('https://nemslinux.com/api/stats/');
$ch = curl_init('https://new.nemslinux.com/api/stats/');
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
$retry = 0;

0 comments on commit bf7b57e

Please sign in to comment.