summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-11-09 20:09:43 +0000
committerSteven Barth <steven@midlink.org>2008-11-09 20:09:43 +0000
commit93d2b0ec84e7f82979aa41b2399b0b3aa8300652 (patch)
treeba7e3ad329fa94f07f6c96da7795f61ce75e1585
parent0d7829638607013939064896b1432067d5302dbc (diff)
Include backup date and hostname in backup archive name
-rw-r--r--modules/admin-full/luasrc/controller/admin/system.lua3
-rw-r--r--modules/admin-mini/luasrc/controller/mini/system.lua3
2 files changed, 4 insertions, 2 deletions
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