diff options
| author | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-03-05 01:19:19 +0000 |
|---|---|---|
| committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-03-05 01:19:19 +0000 |
| commit | 15bbcbcf3a7021f34c1f0af79c039dab89478890 (patch) | |
| tree | 54b00cae17b9fe5cc2519de876bc8a99969e054c | |
| parent | 947f7d6b88ef8e891f67d7fac44961cd20fde406 (diff) | |
| parent | a6a6f9c5a4ddc0295bb12fd93ed0ba23ed696122 (diff) | |
| download | verteco-15bbcbcf3a7021f34c1f0af79c039dab89478890.tar.gz | |
Merge branch 'master' of git.dereenigne.org:/srv/git/verteco
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | README | 1 | ||||
| -rwxr-xr-x | src/ftpupload | 5 |
3 files changed, 7 insertions, 0 deletions
@@ -27,6 +27,7 @@ install: all then \ mkdir $(MODBUSLOGLOGDIR); \ mkdir $(MODBUSLOGLOGDIR)/interval; \ + mkdir $(MODBUSLOGLOGDIR)/archive; \ fi test -f $(MODBUSLOGLOGDIR)/interval/interval.txt || $(INSTALL) -m 644 $(SDIR)/interval.txt $(MODBUSLOGLOGDIR)/interval/interval.txt $(INSTALL) $(SDIR)/ftpupload $(FTPHELPERDIR)/ftpupload @@ -44,6 +44,7 @@ Required files: /etc/modbuslog.cfg configuration file /var/modbuslog/ output directory where logs are stored /var/modbuslog/interval/interval.txt textfile storing unique interval +/var/modbuslog/archive/ directory containing archived log files /var/www/ webserver directory for php scripts Configuration: diff --git a/src/ftpupload b/src/ftpupload index 2483764..7d46f46 100755 --- a/src/ftpupload +++ b/src/ftpupload @@ -20,4 +20,9 @@ mput $FILE bye EOF +# move file to archive mv $FILE /var/modbuslog/archive/ + +# remove files after 3 months +CLEANUP="/var/modbus/archive/"`/usr/bin/ftphelper --mac`"_"`date +%Y_%m --date='4 months ago'`"*.log" +rm $CLEANUP |