openwrt: add a simple luci app for ttyd

diff --git a/.gitignore b/.gitignore
index dc142818a773902a2348fde9c1786ff589431619..1ccef537dae90ad10bb2d639788defdfedec1ac2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,6 @@
 CMakeCache.txt
 CMakeFiles
 CMakeScripts
-Makefile
 cmake_install.cmake
 install_manifest.txt
 CTestTestfile.cmake
@@ -50,4 +49,4 @@ build
 
 # Project files
 html.h
-!openwrt/Makefile
\ No newline at end of file
+!init.d

diff --git a/openwrt/README.md b/openwrt/README.md
index 7e1cf4a78ad0a7237f32839e8dd75dd101b8cfc5..2eac22b9327547efcd1192401b71a123fd790fce 100644 (file)
--- a/openwrt/README.md
+++ b/openwrt/README.md
@@ -8,7 +8,6 @@ curl -sLo- https://downloads.lede-project.org/snapshots/targets/ar71xx/generic/l
 cd lede-sdk-ar71xx-generic_gcc-5.4.0_musl-1.1.15.Linux-x86_64
 ./scripts/feeds update -a
 ./scripts/feeds install -a
-sed -i 's/$(eval $(call BuildPackage,libwebsockets-cyassl))/#\0/' package/feeds/packages/libwebsockets/Makefile
 make defconfig
 make package/feeds/packages/ttyd/compile V=99
 ```

diff --git a/openwrt/luci-app-terminal/Makefile b/openwrt/luci-app-terminal/Makefile
new file mode 100644 (file)
index 0000000..301a3b8
--- /dev/null
+++ b/openwrt/luci-app-terminal/Makefile
@@ -0,0 +1,17 @@
+# Copyright (C) 2016 Openwrt.org
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI support for ttyd
+LUCI_DEPENDS:=+ttyd
+LUCI_PKGARCH:=all
+PKG_VERSION:=1.0
+PKG_RELEASE:=1
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+

diff --git a/openwrt/luci-app-terminal/luasrc/controller/terminal.lua b/openwrt/luci-app-terminal/luasrc/controller/terminal.lua
new file mode 100644 (file)
index 0000000..ab95f46
--- /dev/null
+++ b/openwrt/luci-app-terminal/luasrc/controller/terminal.lua
@@ -0,0 +1,9 @@
+module("luci.controller.terminal", package.seeall)
+
+function index()
+       if not (luci.sys.call("pidof ttyd > /dev/null") == 0) then
+               return
+       end
+       
+       entry({"admin", "system", "terminal"}, template("terminal"), _("Terminal"), 10).leaf = true
+end
\ No newline at end of file

diff --git a/openwrt/luci-app-terminal/luasrc/view/terminal.htm b/openwrt/luci-app-terminal/luasrc/view/terminal.htm
new file mode 100644 (file)
index 0000000..db9b46c
--- /dev/null
+++ b/openwrt/luci-app-terminal/luasrc/view/terminal.htm
@@ -0,0 +1,9 @@
+<%+header%>
+<div class="cbi-map">
+        <h2 name="content"><%=translate("Terminal")%></h2>
+        <iframe id="terminal" style="width: 100%; min-height: 500px; border: none; border-radius: 3px;"></iframe>
+</div>
+<script type="text/javascript">
+        document.getElementById("terminal").src = window.location.protocol + "//" + window.location.hostname + ":7681";
+</script>
+<%+footer%>
\ No newline at end of file

diff --git a/openwrt/luci-app-terminal/po/zh-cn/terminal.po b/openwrt/luci-app-terminal/po/zh-cn/terminal.po
new file mode 100644 (file)
index 0000000..9fb0596
--- /dev/null
+++ b/openwrt/luci-app-terminal/po/zh-cn/terminal.po
@@ -0,0 +1,5 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Terminal"
+msgstr "终端"

diff --git a/openwrt/luci-app-terminal/root/etc/init.d/ttyd b/openwrt/luci-app-terminal/root/etc/init.d/ttyd
new file mode 100755 (executable)
index 0000000..8721665
--- /dev/null
+++ b/openwrt/luci-app-terminal/root/etc/init.d/ttyd
@@ -0,0 +1,26 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+SERVICE_WRITE_PID=1
+SERVICE_DAEMONIZE=1
+
+start() {
+       logger -t TTYD 'Starting ttyd service'
+       service_start /usr/bin/ttyd -i br-lan /bin/login
+       return 0
+}
+
+stop() {
+       if [ -n "`pidof ttyd`" ]; then
+               logger -t TTYD 'Shutting down ttyd service'
+               service_stop /usr/bin/ttyd
+       fi
+       return 0
+}
+
+restart() {
+       logger -t TTYD 'Restarting ttyd service'
+       stop
+       sleep 2
+       start
+}

diff --git a/openwrt/Makefile b/openwrt/ttyd/Makefile
similarity index 100%
rename from openwrt/Makefile
rename to openwrt/ttyd/Makefile