nmelone/www-POC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renames file to align with script purpose

Browse Source
This commit is contained in:
Patrick McDonagh
2016-12-05 12:26:46 -06:00
parent ad72c83b2f
commit b29e1a2b23
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/static/js/backup_restore.controller.js
View File

@@ -87,6 +87,7 @@ poconsole.controller('backupRestoreCtrl', function($scope, $route, $http, $route
}; };
$scope.backupBRTagsAll = function(){ $scope.backupBRTagsAll = function(){
$scope.loading = true;
var backupBRTagVal = BackupRestore.backupBRTagValuesAll(); var backupBRTagVal = BackupRestore.backupBRTagValuesAll();
backupBRTagVal.then(function(data){ backupBRTagVal.then(function(data){
$scope.loadBRTagList(1); $scope.loadBRTagList(1);
@@ -101,6 +102,7 @@ poconsole.controller('backupRestoreCtrl', function($scope, $route, $http, $route
}; };
$scope.restoreBRTagsAll = function(){ $scope.restoreBRTagsAll = function(){
$scope.loading = true;
var restoreBRTagVal = BackupRestore.restoreBRTagValuesAll(); var restoreBRTagVal = BackupRestore.restoreBRTagValuesAll();
restoreBRTagVal.then(function(data){ restoreBRTagVal.then(function(data){
$scope.loadBRTagList(1); $scope.loadBRTagList(1);

10
datalogger.sh → webserver.sh
View File

@@ -1,18 +1,18 @@
#!/bin/sh #!/bin/sh
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: datalogger # Provides: webserver
# Required-Start: $local_fs $network $named $time $syslog # Required-Start: $local_fs $network $named $time $syslog
# Required-Stop: $local_fs $network $named $time $syslog # Required-Stop: $local_fs $network $named $time $syslog
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Description: Runs the Henry Pump Datalogger # Description: Runs the Henry Pump Webserver
### END INIT INFO ### END INIT INFO
SCRIPT=/root/www/start.sh SCRIPT=/root/www/start.sh
RUNAS=poconsole RUNAS=poconsole
PIDFILE=/root/datalogger.pid PIDFILE=/root/webserver.pid
LOGFILE=/root/datalogger.log LOGFILE=/root/webserver.log
start() { start() {
if [ -f "$PIDFILE" ] && kill -0 $(cat $PIDFILE); then if [ -f "$PIDFILE" ] && kill -0 $(cat $PIDFILE); then
@@ -43,7 +43,7 @@ uninstall() {
stop stop
rm -f "$PIDFILE" rm -f "$PIDFILE"
echo "Notice: log file is not be removed: '$LOGFILE'" >&2 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" rm -fv "$0"
fi fi
} }