diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2009-03-23 19:40:24 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2009-03-23 19:40:24 +0000 |
| commit | fa8ecfa1d3f70eafec0a7bbbd4020124520a64ee (patch) | |
| tree | b8c22c678f7fbf554db059eaf4ef55e2eb1d3dc5 | |
| parent | 2d8c9daf184d648b6e6ebfb49d29f1fd561c7f4d (diff) | |
| download | acf-iptables-fa8ecfa1d3f70eafec0a7bbbd4020124520a64ee.tar.bz2 acf-iptables-fa8ecfa1d3f70eafec0a7bbbd4020124520a64ee.tar.xz | |
Changed the way startstop works in core to add a list of allowed actions. Modified all ACFs that don't use the standard functions to work with new library method.
| -rw-r--r-- | iptables-model.lua | 16 | ||||
| -rw-r--r-- | iptables-startstop-html.lsp | 19 |
2 files changed, 10 insertions, 25 deletions
diff --git a/iptables-model.lua b/iptables-model.lua index 0447e41..d893f60 100644 --- a/iptables-model.lua +++ b/iptables-model.lua @@ -555,20 +555,6 @@ function updaterulesfile(filedetails) return modelfunctions.setfiledetails(filedetails, {rulesfile}) end --- local implementation to add save, reload, and panic actions function startstop_service(action) - local cmdresult = cfe({ label="Start/Stop result" }) - - if (string.lower(action) == "start") or (string.lower(action) == "stop") or (string.lower(action) == "restart") or (string.lower(action) == "save") or (string.lower(action) == "reload") or (string.lower(action) == "panic") then - local file = io.popen( "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin /etc/init.d/" .. - servicename .. " " .. string.lower(action) .. " 2>&1" ) - if file ~= nil then - cmdresult.value = file:read( "*a" ) - file:close() - end - posix.sleep(2) -- Wait for the process to start|stop - else - cmdresult.errtxt = "Unknown command!" - end - return cmdresult + return modelfunctions.startstop_service(servicename, action, {"start", "stop", "restart", "save", "reload", "panic"}) end diff --git a/iptables-startstop-html.lsp b/iptables-startstop-html.lsp index 9b6c9c0..26cbe9a 100644 --- a/iptables-startstop-html.lsp +++ b/iptables-startstop-html.lsp @@ -1,6 +1,15 @@ <% local data, viewlibrary, page_info = ... %> <H1>Management</H1> + +<% if data.value.result then %> +<H2>Previous action result</H2> +<% if data.value.result.value ~= "" then %> +<P CLASS='descr'><%= string.gsub(html.html_escape(data.value.result.value), "\n", "<BR>") %></P> +<% end if data.value.result.errtxt then %> +<P CLASS='error'><%= string.gsub(html.html_escape(data.value.result.errtxt), "\n", "<BR>") %></P> +<% end end %> + <DL> <form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action) %>" method="POST"> <DT>Load rules from rules file</DT> @@ -12,14 +21,4 @@ <input class="submit" type="submit" name="action" value="Save"> </DD> </form> - -<% if data.value.result then %> -<DT>Previous action result</DT> -<DD> -<% if data.value.result.value ~= "" then %> -<P CLASS='descr'><%= string.gsub(html.html_escape(data.value.result.value), "\n", "<BR>") %></P> -<% end if data.value.result.errtxt then %> -<P CLASS='error'><%= string.gsub(html.html_escape(data.value.result.errtxt), "\n", "<BR>") %></P> -<% end end %> -</DD> </DL> |