diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/lighttpd.sample.conf | 4 | ||||
| -rw-r--r-- | config/templates/ciscoata-template.lua | 6 | ||||
| -rw-r--r-- | config/templates/linksysata-template.lua | 2 | ||||
| -rw-r--r-- | config/templates/polycom-template.lua | 10 | ||||
| -rw-r--r-- | config/templates/snom-template.lua | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/config/lighttpd.sample.conf b/config/lighttpd.sample.conf index 23dbe0d..f1b605b 100644 --- a/config/lighttpd.sample.conf +++ b/config/lighttpd.sample.conf @@ -71,7 +71,7 @@ server.follow-symlink = "enable" # event handler (defaults to "poll") # see performance.txt -# +# # for >= linux-2.4 # server.event-handler = "linux-rtsig" # for >= linux-2.6 @@ -290,7 +290,7 @@ url.access-deny = ("~", ".inc") # don't forget to add index.cml to server.indexfiles # cml.extension = ".cml" # cml.memcache-hosts = ( "127.0.0.1:11211" ) -# }}} +# }}} # {{{ mod_webdav # see webdav.txt diff --git a/config/templates/ciscoata-template.lua b/config/templates/ciscoata-template.lua index dae131c..323185d 100644 --- a/config/templates/ciscoata-template.lua +++ b/config/templates/ciscoata-template.lua @@ -123,14 +123,14 @@ if tz then -- ["+05.5"] = {0}, -- Bombay, Calcutta, Madras, New Delhi "+05.5 1 0" 0 ["+06"] = {7}, -- Bangladesh, Russia "+06 1 7" 0 ["+07"] = {7}, -- Thailand, Russia "+07 1 7" 0 - ["+08"] = {4, 7, 0, 0}, -- Australia Western "+08 1 4" 0 + ["+08"] = {4, 7, 0, 0}, -- Australia Western "+08 1 4" 0 -- Russia "+08 2 7" ? -- China, Hong Kong "+08 3 0" 0 -- Singapore, Taiwan "+08 4 0" 0 ["+09"] = {0}, -- Japan, Korea "+09 1 0" 0 -- ["+09.5"] = {10}, -- South Australia "+09.5 1 10" CST-9:30CST,M10.1.0,M4.1.0/3 ["+10"] = {7, 4}, -- Guam, Russia "+10 1 7" 0 - -- Australia "+10 2 4" + -- Australia "+10 2 4" ["+11"] = {0}, -- Soloman Islands "+11 1 0" 0 ["+12"] = {0, 4, 0}, -- Fiji "+12 1 0" ? -- New Zealand "+12 2 4" NZST-12NZDT,M9.5.0,M4.1.0/3 @@ -173,7 +173,7 @@ if tz then else -- Just don't set it end - + if tz.dst then xml_elem("Auto_Adjust_Clock", true, "na") else diff --git a/config/templates/linksysata-template.lua b/config/templates/linksysata-template.lua index d05d512..b2fb038 100644 --- a/config/templates/linksysata-template.lua +++ b/config/templates/linksysata-template.lua @@ -114,7 +114,7 @@ if tz then return date.."/"..time end - + if tz.dst then xml_elem("Daylight_Saving_Time_Enable", "Yes", "na") xml_elem("Daylight_Saving_Time_Rule", "start="..dstrule(tz.dst.start)..";end="..dstrule(tz.dst.stop)..";save=1", "na") diff --git a/config/templates/polycom-template.lua b/config/templates/polycom-template.lua index 3869e3e..6a874ff 100644 --- a/config/templates/polycom-template.lua +++ b/config/templates/polycom-template.lua @@ -69,7 +69,7 @@ device.set="1" <% local values = ... %> -<% +<% local function xml_attr (t, v) if v ~= nil then -- Check for -0, which is invalid for Polycom but fine for Lua @@ -77,7 +77,7 @@ local function xml_attr (t, v) -- v could be a string, boolean, or a number io.write(table.concat(t, '.') .. '="' .. tostring(v) .. '"\n') end -end +end %> <% @@ -141,7 +141,7 @@ if tz then local function dstrule ( pos ) local dstprefix = 'tcpIpApp.sntp.daylightSavings' local t = tz.dst[pos] - + -- Handle explicit hour for DST change -- (Polycom doesn't implement explicit min or sec) -- (Polycom DST implementation assumes DST change is 1 hour) @@ -164,7 +164,7 @@ if tz then -- POSIX weekday is between 0 (Sun) and 6 (Sat) -- Polycom dayOfWeek is 1=Sun, 7=Sat xml_attr({ dstprefix, pos, 'dayOfWeek' }, tonumber(t.weekday) + 1) - + -- POSIX week from 1 to 5, where 1st,2nd..4th, and 5=last if t.week == '5' then xml_attr({ dstprefix, pos, 'dayOfWeek.lastInMonth' }, true) @@ -176,7 +176,7 @@ if tz then end end - + if tz.dst then xml_attr({'tcpIpApp.sntp.daylightSavings.enable'}, true) diff --git a/config/templates/snom-template.lua b/config/templates/snom-template.lua index 635ce3e..19c529e 100644 --- a/config/templates/snom-template.lua +++ b/config/templates/snom-template.lua @@ -128,7 +128,7 @@ if tz then return date..' '..time end - + if tz.dst then xml_elem('dst', '3600 '..dstrule(tz.dst.start)..' '..dstrule(tz.dst.stop), 'R') else |