diff --git a/aria2/files/aria2.init b/aria2/files/aria2.init index 8062593bc..d68057082 100644 --- a/aria2/files/aria2.init +++ b/aria2/files/aria2.init @@ -313,7 +313,7 @@ aria2_start() { config_list_foreach "$section" "header" append_header config_list_foreach "$section" "extra_settings" append_setting - cd /usr/share/aria2 && sh ./tracker.sh >/dev/null 2>&1 + cd /usr/share/aria2 && sh ./tracker.sh >/dev/null 2>&1 & cat /usr/share/aria2/aria2.conf > "$config_file" echo '' >> "$config_file" sed '/^$/d' "$config_file_tmp" >> "$config_file" @@ -347,7 +347,7 @@ aria2_start() { procd_set_param user "$user" procd_add_jail "$NAME.$section" log - procd_add_jail_mount "$config_file" + procd_add_jail_mount "$ca_certificate" "$certificate" "$rpc_certificate" "$rpc_private_key" procd_add_jail_mount_rw "$dir" "$config_dir" "$log" procd_close_instance } diff --git a/luci-app-mosdns/root/etc/mosdns/rule/geoip_cn.txt b/luci-app-mosdns/root/etc/mosdns/rule/geoip_cn.txt index 01dc009ee..d65e86ec8 100644 --- a/luci-app-mosdns/root/etc/mosdns/rule/geoip_cn.txt +++ b/luci-app-mosdns/root/etc/mosdns/rule/geoip_cn.txt @@ -2475,7 +2475,7 @@ 103.145.122.0/23 103.145.188.0/22 103.146.72.0/23 -103.146.88.0/22 +103.146.90.0/23 103.146.124.0/22 103.146.138.0/23 103.146.230.0/23 diff --git a/luci-app-mosdns/root/etc/mosdns/rule/geosite_cn.txt b/luci-app-mosdns/root/etc/mosdns/rule/geosite_cn.txt index 8f20f522a..939721307 100644 --- a/luci-app-mosdns/root/etc/mosdns/rule/geosite_cn.txt +++ b/luci-app-mosdns/root/etc/mosdns/rule/geosite_cn.txt @@ -546,7 +546,6 @@ 0852job.com 0853rc.com 0854job.com -0855job.com 0856job.com 0857job.com 0859job.com @@ -1022,8 +1021,6 @@ 123aoe.com 123baofeng.com 123bo.com -123buyu.com -123buyu.net 123ds.org 123du.cc 123ems.com @@ -1520,7 +1517,6 @@ 17m3.com 17meiwen.com 17mf.com -17miyou.com 17mqw.com 17ms.com 17neo.com @@ -2893,7 +2889,6 @@ 365htk.com 365huaer.com 365huifu.com -365huo.com 365ibank.com 365icl.com 365ime.com @@ -3112,7 +3107,6 @@ 3ddl.net 3ddl.org 3deazer.com -3dfrom.com 3dgenomics.org 3dhao.com 3dhat.com @@ -3210,7 +3204,6 @@ 3s001.com 3s3w.com 3s78.com -3sbase.com 3scard.com 3shuwu.com 3snews.net @@ -3394,7 +3387,6 @@ 4493.com 44971.com 44dt.com -44england.com 44vs.com 453600.net 45575.com @@ -5968,7 +5960,6 @@ 8555220.com 8558.org 85679999.com -857yzf.com 8587.se 85878078.com 858game.com @@ -8541,7 +8532,6 @@ anquanbao.com anquanke.com anquanquan.info anquantong.com -anquanxia.com anrayer.com anren.org anrenmind.com @@ -10076,7 +10066,6 @@ bcbm66666.com bcbm688.com bcbpm.com bcbvi.com -bccfw.com bccn.net bccnsoft.com bccv.com @@ -11683,7 +11672,6 @@ bshare.com bsida.com bsidu.com bsjhhzs.com -bsjquanwu.com bskrt.com bskuav.com bsmz.net @@ -12715,7 +12703,6 @@ cctime.com cction.com cctlife.com cctocloud.com -cctongwen.com cctpress.com cctry.com cctv-19.com @@ -13624,7 +13611,6 @@ chenguangblog.com chengxiangqian.com chengxinyouxuan.com chengxuan.com -chengyangnews.com chengyangyang.com chengye-capital.com chengyucd.com @@ -14440,7 +14426,6 @@ chinca.org chindiaforum.com chine-info.com chinee.com -chinese-luxury.com chinese-no1.com chineseacc.com chineseafs.org @@ -16091,7 +16076,6 @@ colourlife.com com-rail.com com.fi com.tv -com21.com com4loves.com comac.cc comake.online @@ -16158,7 +16142,6 @@ controlinai.com conuo.com convergemob.com convertlab.com -conwos.com conyedit.com coobar.com cooboys.com @@ -16172,7 +16155,6 @@ coofans.com cooffee.net cooh5.com coohua.com -cookbookchina.com cookcai.com cookie4you.com cool-admin.com @@ -17296,7 +17278,6 @@ daicuo.net daicuo.vip daicuo.wang daidaidui.club -daidaitong.com daidaitv.com daidongxi.com daigou.com @@ -18148,7 +18129,6 @@ dgjy.net dgjyw.com dglpool.com dgmama.net -dgmmbb.com dgn.cc dgod.net dgphospital.com @@ -18910,7 +18890,6 @@ doitim.com doiua.com doki8.com doklam.wang -dolanzz.com dolcn.com dole.club dolfincdnx.com @@ -19876,7 +19855,6 @@ eachnet.com eachsee.com eaeb.com eafifaonline2.com -eaglexiang.org eahui.com eaibot.com eaka365.com @@ -23452,7 +23430,6 @@ genetalks.com geneworldcn.com gengchuangz.com gengnie.com -gengwen.net geniatech.com geniusite.com genrace.com @@ -24886,7 +24863,6 @@ gz-data.com gz-gz.com gz-lodihair.com gz-notary.com -gz-richip.com gz-station.com gz-tylx.com gz007.net @@ -25800,6 +25776,7 @@ hb30.com hb3rm.com hb500.com hb6.org +hb96369.com hb96568.com hbadei.com hbanbao.com @@ -26672,6 +26649,7 @@ hindlish.com hinew8.com hinpy.com hiopensource.com +hiosu.com hioug.com hiparking.com hipcam.net @@ -28232,7 +28210,6 @@ huohuo.com huohuolife.com huoji.com huoju365.com -huojuli.com huokebao.net huokesoft.com huolala.co @@ -29094,7 +29071,6 @@ icvip.com icxbk.com icxinli.com icy-capital.com -icyip.com iczhiku.com iczoom.com id-bear.com @@ -29547,7 +29523,6 @@ ijizhi.com ijjnews.com ijn952.com ijnqc.com -ijogame.com ijq.tv ijshs.com ijsp.net @@ -29620,7 +29595,6 @@ ilewan.com iliangcang.com ilibrand.com ilidubj.net -ilife69.com ilifesmart.com ilinekesy.com ilingdai.com @@ -31831,7 +31805,6 @@ jingua168.com jingujie.com jingutrust.com jingwacenter.com -jingwei.com jingwei.link jingwuhui.com jingwxcx.com @@ -32299,7 +32272,6 @@ jllihua.com jlmhw.com jlonline.com jlpay.com -jlpmc.com jlpzj.net jlq.com jlr360.com @@ -36654,7 +36626,6 @@ longsto.com longsunhenges.com longsys.com longtaifoods.com -longtaitouxiaoshuo.com longtaiwj.com longtanshuw.net longtask.com @@ -38953,7 +38924,6 @@ mm111.net mm131.kim mm138.com mm2hservices.com -mm2uu.com mm52.com mm52.net mm8mm8.com @@ -39490,6 +39460,7 @@ mszxyh.com mt-bbs.com mt-wire.com mt77.com +mt888vip.com mtasia.net mtavip.com mtblj.com @@ -40524,7 +40495,6 @@ nhdmd.com nhganggeban.com nhhwhxh.com nhnexpo.com -nhnsc.com nhnst.com nhooo.com nhstu.com @@ -40820,7 +40790,6 @@ nntlj.com nntskq.com nntxw.com nnwb.com -nnweding.com nnynrc.com nnzsxblaw.com noahedu.com @@ -42267,7 +42236,6 @@ pdf100.net pdf1122.com pdf5.net pdfbianji.com -pdfdo.com pdfdowell.com pdfexpert.cc pdffsy.com @@ -45238,6 +45206,7 @@ redcome.com redcross-hx.com redcross-sha.org redefine.ltd +redelegation.net redflag-linux.com redhome.cc redhongan.com @@ -46154,7 +46123,6 @@ sanjun.com sankaijian.com sankgo.com sankougift.com -sankoup1.com sankuai.com sanlan123.com sanliu2021.com @@ -46667,7 +46635,6 @@ seekchem.com seekfunbook.com seekhill.com seekonly.net -seekplay.online seelvyou.com seemmo.com seemoread.com @@ -47079,7 +47046,6 @@ shanmao.me shannon-sys.com shannonai.com shanp.com -shanqb.com shanqu.cc shanrongmall.com shanse8.com @@ -52815,6 +52781,7 @@ tx009.com tx163.com tx29.com tx5d.com +tx9968.com txbapp.com txbimg.com txbyod.com @@ -53684,7 +53651,6 @@ uw9.net uwa4d.com uwan.com uwenku.com -uwexp.com uworter.com ux18.com ux6.com @@ -54758,6 +54724,7 @@ wannengxiaoge.com wannengzj.com wannianli.mobi wannianli.net +wannianli2.com wannianli8.com wannuoda.com wanplus.com @@ -57440,7 +57407,6 @@ xdrenwu.com xdressy.com xdrig.com xdrtc.com -xds04.com xdsipo.com xdtos.com xduoo.com @@ -57466,7 +57432,6 @@ xelz.info xen0n.name xender.com xenium.mobi -xenvpser.com xerlang.com xesapp.com xescdn.com @@ -57990,6 +57955,7 @@ xiaotiancai.com xiaotut.com xiaotuzhan.com xiaou2014.com +xiaoupan.com xiaoushuo.com xiaowang.net xiaowangshen.com @@ -58126,7 +58092,6 @@ xiechuangw.com xiecuo.com xiedaimala.com xiefenxiang.com -xieheedu.com xiehejx.com xiehekjkf.com xiehuiyi.com @@ -58351,7 +58316,6 @@ xingyuyouxi.com xingzhang.com xingzhige.com xingzhilan.com -xingzhilian.net xingzhiyue.com xingzuo.com xingzuo8090.com @@ -63742,7 +63706,6 @@ zhongniu.com zhongpaiwang.com zhongqixin360.com zhongrenbang.cc -zhongrongjz.com zhongruigang.com zhongruihuacheng.com zhongruitech.com diff --git a/luci-theme-design/LICENSE b/luci-theme-design/LICENSE new file mode 100644 index 000000000..261eeb9e9 --- /dev/null +++ b/luci-theme-design/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/luci-theme-design/README.md b/luci-theme-design/README.md new file mode 100644 index 000000000..edc723f5c --- /dev/null +++ b/luci-theme-design/README.md @@ -0,0 +1,110 @@ +
+