From b29e1a2b23c24cc480b4a4b9214c920c8d66f264 Mon Sep 17 00:00:00 2001 From: Patrick McDonagh Date: Mon, 5 Dec 2016 12:26:46 -0600 Subject: [PATCH] Renames file to align with script purpose --- app/static/js/backup_restore.controller.js | 2 ++ datalogger.sh => webserver.sh | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) rename datalogger.sh => webserver.sh (87%) diff --git a/app/static/js/backup_restore.controller.js b/app/static/js/backup_restore.controller.js index 5297df5..35fe7a9 100644 --- a/app/static/js/backup_restore.controller.js +++ b/app/static/js/backup_restore.controller.js @@ -87,6 +87,7 @@ poconsole.controller('backupRestoreCtrl', function($scope, $route, $http, $route }; $scope.backupBRTagsAll = function(){ + $scope.loading = true; var backupBRTagVal = BackupRestore.backupBRTagValuesAll(); backupBRTagVal.then(function(data){ $scope.loadBRTagList(1); @@ -101,6 +102,7 @@ poconsole.controller('backupRestoreCtrl', function($scope, $route, $http, $route }; $scope.restoreBRTagsAll = function(){ + $scope.loading = true; var restoreBRTagVal = BackupRestore.restoreBRTagValuesAll(); restoreBRTagVal.then(function(data){ $scope.loadBRTagList(1); diff --git a/datalogger.sh b/webserver.sh similarity index 87% rename from datalogger.sh rename to webserver.sh index 400bc1d..41eda6f 100644 --- a/datalogger.sh +++ b/webserver.sh @@ -1,18 +1,18 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: datalogger +# Provides: webserver # Required-Start: $local_fs $network $named $time $syslog # Required-Stop: $local_fs $network $named $time $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Description: Runs the Henry Pump Datalogger +# Description: Runs the Henry Pump Webserver ### END INIT INFO SCRIPT=/root/www/start.sh RUNAS=poconsole -PIDFILE=/root/datalogger.pid -LOGFILE=/root/datalogger.log +PIDFILE=/root/webserver.pid +LOGFILE=/root/webserver.log start() { if [ -f "$PIDFILE" ] && kill -0 $(cat $PIDFILE); then @@ -43,7 +43,7 @@ uninstall() { stop rm -f "$PIDFILE" echo "Notice: log file is not be removed: '$LOGFILE'" >&2 - update-rc.d -f datalogger remove + update-rc.d -f webserver remove rm -fv "$0" fi }