20190625_jeffrey - silenceuncrio/diary GitHub Wiki
0910
review
0935
M300 web ui 被建議如下
左側選單過長
比如點選了 restart 後右邊並不會出現任何結果
必須自己手動捲動到最上面才看的到
建議是右邊要能自動置頂
相關的issue 為 0000567: (Hauman) Fine Tune Web UI
M300 切換至 branch release/v2.00
拉最新的 code
Products/Vendor 選擇 M300/0_GENERIC
build 一份 image
1025
參考 How to scroll to top of the page in AngularJS? 順利解決
M300 - release/v2.00
scroll to top at each time a angularjs route change
commit 4fa99d423f2f63b90411823d8edce7a17067bfd5
Refs: [release/v2.00], {origin/release/v2.00}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 10:28:27 2019 +0800
scroll to top at each time a angularjs route change
proscend/prosrc/www/app/app.controller.js | 3 +++
1 file changed, 3 insertions(+)
同樣的方式可以套到 M330 和 M360 去
1050
M300 有追加的 ui 修改
ariel 有準備 wiki
修改的目標是 M300 - release/v2.00
1130
M300 - release/v2.00
先完成 WAN > Ethernet
commit 0982469bd73a1429c4c5c411d07959dd4efb39f5
Refs: [release/v2.00], {origin/release/v2.00}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 11:29:33 2019 +0800
at 'WAN > Ethernet':
- add 2 fields at 'Ethernet Ping Health' tab
- Method
- Use the first twe DNS from ISP
- remove 2 fields at 'Ethernet Ping Health' tab
- IPv6 Host 1
- IPv6 Host 2
proscend/prosrc/webcgi/connmgr.c | 10 +++++
proscend/prosrc/www/app/feature/wanEthernet.html | 47 +++++++++++++++++++++---
proscend/prosrc/www/app/locale-en.json | 7 ++++
proscend/prosrc/www/app/locale-fr.json | 7 ++++
proscend/prosrc/www/app/locale-zh-tw.json | 7 ++++
5 files changed, 72 insertions(+), 6 deletions(-)
1310
M300 - release/v2.00
先依據 ariel 修改的 typo 做更動
commit 1f29cea249c846f68007bd57104b0d273df6588d
Refs: [release/v2.00], {origin/release/v2.00}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 13:09:19 2019 +0800
modify base on the fixed typo
proscend/prosrc/webcgi/connmgr.c | 4 ++--
proscend/prosrc/www/app/feature/wanEthernet.html | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
1350
M300 - release/v2.00
完成 LTE > LTE Config
commit 68439d6572eb8b6f8a33f35b3476393805b94779
Refs: [release/v2.00], {origin/release/v2.00}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 13:49:20 2019 +0800
at 'LTE > LTE Config':
- add 2 fields
- Method
- Use the first twe DNS from ISP
- remove 2 fields at 'Ethernet Ping Health' tab
- IPv6 Host 1
- IPv6 Host 2
proscend/prosrc/webcgi/lte.c | 6 ++++
proscend/prosrc/www/app/locale-en.json | 7 ++++
proscend/prosrc/www/app/locale-fr.json | 7 ++++
proscend/prosrc/www/app/locale-zh-tw.json | 7 ++++
.../prosrc/www/src/app/feature/lteConfig.html.src | 40 +++++++++++++++++++---
5 files changed, 63 insertions(+), 4 deletions(-)
1350
先切到 M330 - release/v0.04
把早上左側選單過長的解法也套到 M330 去
commit 8022eab028ab32cd06bc180151ab6aa4ee04b156
Refs: [release/v0.04], {origin/release/v0.04}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 13:58:18 2019 +0800
scroll to top at each time a angularjs route change
proscend/prosrc/www/app/app.controller.js | 3 +++
1 file changed, 3 insertions(+)
1400
M360 - develop 也套一下
commit 06713255f0db42c15e56bc17c1c15789f2867c3c
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 14:02:05 2019 +0800
scroll to top at each time a angularjs route change
proscend/prosrc/www/app/app.controller.js | 3 +++
1 file changed, 3 insertions(+)
1405
回到 M330 - feature/lighttpd
- Procuts/Vendor = M330/0_GENERIC
build image
透過 uboot upgrade
把 /www 複製到 /tmp
cp -r /www /tmp
利用 M300 產生 certification 的 shell script - web_x509_lighttpd.sh
#!/bin/bash
openssl req -x509 -newkey rsa:2048 -keyout /tmp/icos/web/lighttpd.pem -out /tmp/icos/web/lighttpd.pem -days 3650 -nodes -subj '/CN=localhost'
mv /tmp/icos/web/lighttpd.pem /etc/icos/web/lighttpd.pem
sync
還有 lighttpd.conf
server.document-root = "/tmp/www/"
server.bind = "0.0.0.0"
server.port = 3000
$SERVER["socket"] == "[::]:3000" { }
$SERVER["socket"] == "0.0.0.0:3443" {
ssl.engine = "enable"
ssl.pemfile = "/etc/icos/web/lighttpd.pem"
}
$SERVER["socket"] == "[::]:3443" {
ssl.engine = "enable"
ssl.pemfile = "/etc/icos/web/lighttpd.pem"
}
server.modules = ( "mod_rewrite", "mod_cgi" )
index-file.names = ( "index.html" )
mimetype.assign = (
".gif" => "image/gif",
".jpg" => "image/jpeg",
".jpeg" => "image/jpeg",
".png" => "image/png",
".css" => "text/css",
".html" => "text/html",
".htm" => "text/html",
".txt" => "text/plain",
)
cgi.assign = ( ".cgi" => "" )
url.rewrite = (
"^/api/([a-zA-Z]+)[0-9a-zA-Z=.?]*$" => "/cgi-bin/api.cgi?act=$1",
)
都透過 tftp 來得到所需要的檔案
root@M330:~# cp -r /www/ /tmp/
root@M330:~# cd /tmp/
root@M330:/tmp# tftp -g -r web_x509_lighttpd.sh 192.168.1.113
root@M330:/tmp# tftp -g -r lighttpd.conf 192.168.1.113
root@M330:/tmp# chmod 755 web_x509_lighttpd.sh
root@M330:/tmp# ./web_x509_lighttpd.sh
Generating a 2048 bit RSA private key
...........................+++
................................................................................................................+++
writing new private key to '/tmp/icos/web/lighttpd.pem'
-----
root@M330:/tmp# lighttpd -f /tmp/lighttpd.conf
1970-01-01 00:04:14: (log.c.166) server started
root@M330:/tmp#
1430
M330 - feature/lighttpd - 'LAN > VLAN'
commit 65639cebe789cf9678cd831fa0648edc04c53515
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 14:30:26 2019 +0800
feature/lighttpd - 'LAN > VLAN'
vlan.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/vlan.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
1435
M330 - feature/lighttpd - 'LAN > Subnet'
commit 259f173e6293b369f0e21b4026aae25730a03df7
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 14:36:23 2019 +0800
feature/lighttpd - 'LAN > Subnet'
vlan_lan_control.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/vlan_lan_control.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
1445
M330 - feature/lighttpd - 'IP Routing > Static Route'
commit 124fbb4b6e727cc4f2a4125ba8dde21b792612fc
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 14:43:16 2019 +0800
feature/lighttpd - 'IP Routing > Static Route'
route.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _status);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/route.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
1450
M330 - feature/lighttpd - 'IP Routing > RIP'
commit c963f6937e15f8c84a5f6ed45d868d5010253f8d
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 14:48:03 2019 +0800
feature/lighttpd - 'IP Routing > RIP'
rip_2g.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/rip_2g.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
M330 - feature/lighttpd - 'IP Routing > OSPF'
ommit dc1815bfabaf949d38bb572d540867c99510869f
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 14:52:19 2019 +0800
feature/lighttpd - 'IP Routing > OSPF'
ospf_2g.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/ospf_2g.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
M330 - feature/lighttpd - 'IP Routing > BGP'
commit fb762483bae0f1d2a471f71a6b692aa322f15276
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 14:55:47 2019 +0800
feature/lighttpd - 'IP Routing > BGP'
bgp.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/bgp.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
1515
M330 - feature/lighttpd - 'VPN > Open VPN'
commit 1852d048ac4cf4d363741d09000bf52fdb3639e2
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 15:13:35 2019 +0800
feature/lighttpd - 'VPN > Open VPN'
openvpn.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _act_apply)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _status)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _cert_status)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _cert_generate)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _info)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _download)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _import)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help)
use the full path of `FilesJSON.sh` or cgi with lighttpd will fail
proscend/prosrc/icos/icoslib/openvpn/openvpn.c | 2 +-
proscend/prosrc/webcgi/openvpn.c | 101 +++++++++++++------------
2 files changed, 55 insertions(+), 48 deletions(-)
注意到 icos openvpn module 的修改
1520
M330 - feature/lighttpd - 'VPN > IPSec'
commit 686d9880ac36bf49ad054399028019cd4c724234
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 15:20:16 2019 +0800
feature/lighttpd - 'VPN > IPSec'
ipsec.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _status)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _conn_status)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _create)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _info)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _download)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _import)
proscend/prosrc/webcgi/ipsec.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
M330 - feature/lighttpd - 'VPN > GRE'
commit c1a7fa201b9b5eb973588e1cd4e0d6b42fe579a6
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 15:23:58 2019 +0800
feature/lighttpd - 'VPN > GRE'
gre.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help)
proscend/prosrc/webcgi/gre.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
M330 - feature/lighttpd - 'VPN > PPTP Server'
commit e7dbac174e32e0e02ed958b5c555e1843c9a3881
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 15:27:22 2019 +0800
feature/lighttpd - 'VPN > PPTP Server'
pptpd.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help)
proscend/prosrc/webcgi/pptpd.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
1545
早上的 M300 修改有一些漏掉了
commit e44912ac6448b58887f9d099ecb2ac10e1253d45
Refs: [release/v2.00], {origin/release/v2.00}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 15:47:33 2019 +0800
change wording:
- "Ethernet Ping Health" to "Ethernet Health Check"
- "LTE Ping Health" to "LTE Health Check"
proscend/prosrc/www/app/locale-en.json | 12 ++++++------
proscend/prosrc/www/app/locale-fr.json | 12 ++++++------
proscend/prosrc/www/app/locale-zh-tw.json | 8 ++++----
3 files changed, 16 insertions(+), 16 deletions(-)
online manual 順便改一下
1650
M330 CTCU 的版本要把 PROSRC_SCHEDULE_REBOOT 打開
commit f731e9131106db6c1613b0752bf9d9416d3fdd18
Refs: [release/v0.04], {origin/release/v0.04}
Author: jeffrey <[email protected]>
Date: Tue Jun 25 17:13:06 2019 +0800
turn on the PROSRC_SCHEDULE_REBOOT at profiles for CTCU/0_CTCU and CTCU/1_CTCU_WIFI
proscend/mconfig/configs/CTCU/0_CTCU/defconfig | 2 +-
proscend/mconfig/configs/CTCU/1_CTCU_WIFI/defconfig | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)