From: Steven Barth <steven@midlink.org>
Date: Sun, 9 Nov 2008 20:09:31 +0000 (+0000)
Subject: Include backup date and hostname in backup archive name
X-Git-Tag: 0.8.2~39
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=2fd21d049a23a765f7873a8ae5ab470ac904e8c9;p=project%2Fluci.git

Include backup date and hostname in backup archive name
---

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 1afdfc55e..b6de14884 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -144,7 +144,8 @@ function action_backup()
 	elseif backup then
 		luci.util.perror(backup_cmd:format(_keep_pattern()))
 		local backup_fpi = io.popen(backup_cmd:format(_keep_pattern()), "r")
-		luci.http.header('Content-Disposition', 'attachment; filename="backup.tar.gz"')
+		luci.http.header('Content-Disposition', 'attachment; filename="backup-%s-%s.tar.gz"' % {
+			luci.sys.hostname(), os.date("%Y-%m-%d")})
 		luci.http.prepare_content("application/x-targz")
 		luci.ltn12.pump.all(luci.ltn12.source.file(backup_fpi), luci.http.write)
 	elseif reset then
diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua
index 936d2634a..1a2628072 100644
--- a/modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -57,7 +57,8 @@ function action_backup()
 	elseif backup then
 		luci.util.perror(backup_cmd:format(_keep_pattern()))
 		local backup_fpi = io.popen(backup_cmd:format(_keep_pattern()), "r")
-		luci.http.header('Content-Disposition', 'attachment; filename="backup.tar.gz"')
+		luci.http.header('Content-Disposition', 'attachment; filename="backup-%s-%s.tar.gz"' % {
+			luci.sys.hostname(), os.date("%Y-%m-%d")})
 		luci.http.prepare_content("application/x-targz")
 		luci.ltn12.pump.all(luci.ltn12.source.file(backup_fpi), luci.http.write)
 	elseif reset then