diff --git a/luci-app-tailscale/.gitignore b/luci-app-tailscale/.gitignore deleted file mode 100644 index 85df44477..000000000 --- a/luci-app-tailscale/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.DS_Store -*/.DS_Store diff --git a/luci-app-tailscale/LICENSE b/luci-app-tailscale/LICENSE deleted file mode 100644 index f288702d2..000000000 --- a/luci-app-tailscale/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/luci-app-tailscale/Makefile b/luci-app-tailscale/Makefile deleted file mode 100644 index f5cf6db9d..000000000 --- a/luci-app-tailscale/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-only -# -# Copyright (C) 2024 asvow - -include $(TOPDIR)/rules.mk - -LUCI_TITLE:=LuCI for Tailscale -LUCI_DEPENDS:=+tailscale -LUCI_PKGARCH:=all - -PKG_VERSION:=1.3.0 -PKG_RELEASE:=7 - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature \ No newline at end of file diff --git a/luci-app-tailscale/README.md b/luci-app-tailscale/README.md deleted file mode 100644 index 50f4cbde6..000000000 --- a/luci-app-tailscale/README.md +++ /dev/null @@ -1,60 +0,0 @@ -# luci-app-tailscale - -Tailscale is a zero config VPN for building secure networks. - -[![GitHub release (latest by date)](https://img.shields.io/github/v/release/Kingwong55/luci-app-tailscale?style=flat-square)](https://github.com/Kingwong55/luci-app-tailscale/releases) -[![GitHub stars](https://img.shields.io/github/stars/Kingwong55/luci-app-tailscale?style=flat-square)](https://github.com/Kingwong55/luci-app-tailscale/stargazers) -[![License](https://img.shields.io/github/license/Kingwong55/luci-app-tailscale?style=flat-square)](LICENSE) -[![GitHub All Releases](https://img.shields.io/github/downloads/Kingwong55/luci-app-tailscale/total?style=flat-square)](https://github.com/Kingwong55/luci-app-tailscale/releases) - -> Fork from [asvow/luci-app-tailscale](https://github.com/asvow/luci-app-tailscale)，基于 v1.2.6 定制开发。 - -## ✨ 新增功能 - -- **一键更新 Tailscale 内核** — 在 LuCI 设置页面直接检查并更新 Tailscale 二进制文件 -- **自动版本检测** — 页面加载时自动对比当前版本与最新版本 -- **智能按钮状态** — 已是最新版本时按钮自动禁用 - -## 🐛 修复 - -- 修复接口信息页面 `ip` 命令权限错误（添加 `/usr/bin/ip` 兜底路径） -- 更新 rpcd ACL 权限配置 - --------------- - -## How to build - -- Only compatible with luci2 version - -- Enter in your openwrt dir - - *1. replace the default startup script and configuration of Tailscale.* - ```shell - sed -i '/\/etc\/init\.d\/tailscale/d;/\/etc\/config\/tailscale/d;' feeds/packages/net/tailscale/Makefile - ``` - - *2. get luci-app-tailscale source & building* - ```shell - git clone https://github.com/Kingwong55/luci-app-tailscale package/luci-app-tailscale - make menuconfig # choose LUCI -> Applications -> luci-app-tailscale - make package/luci-app-tailscale/compile V=s # luci-app-tailscale - ``` - --------------- - -## How to install prebuilt packages - -- Upload the prebuilt ipk package to the /tmp directory of OpenWrt -- Login OpenWrt terminal (SSH) - - ```shell - opkg update - opkg install --force-overwrite /tmp/luci-*-tailscale*.ipk - ``` - --------------- - -## Thanks -- [asvow/luci-app-tailscale](https://github.com/asvow/luci-app-tailscale) — 原版项目 -- [Carseason/openwrt-tailscale](https://github.com/Carseason/openwrt-tailscale) -- [immortalwrt/luci-app-zerotier](https://github.com/immortalwrt/luci/blob/master/applications/luci-app-zerotier) diff --git a/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js b/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js deleted file mode 100644 index 4d1878ac4..000000000 --- a/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js +++ /dev/null @@ -1,118 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-only - * - * Copyright (C) 2022 ImmortalWrt.org - * Copyright (C) 2024 asvow - */ - -'use strict'; -'require dom'; -'require fs'; -'require poll'; -'require ui'; -'require view'; - -return view.extend({ - async load() { - let res = await fs.exec('/sbin/ip', ['-s', '-j', 'ad']); - if (res.code !== 0 || !res.stdout || res.stdout.trim() === '') { - res = await fs.exec('/usr/bin/ip', ['-s', '-j', 'ad']); - } - if (res.code !== 0 || !res.stdout || res.stdout.trim() === '') { - ui.addNotification(null, E('p', {}, _('Unable to get interface info: %s.').format(res.message || res.stderr || 'unknown error'))); - return []; - } - - try { - const interfaces = JSON.parse(res.stdout); - const tailscaleInterfaces = interfaces.filter(iface => iface.ifname.match(/tailscale[0-9]+/)); - - return tailscaleInterfaces.map(iface => { - const parsedInfo = { - name: iface.ifname - }; - - const addr_info = iface.addr_info || []; - addr_info.forEach(addr => { - if (addr.family === 'inet' && !parsedInfo.ipv4) { - parsedInfo.ipv4 = addr.local; - } else if (addr.family === 'inet6' && !parsedInfo.ipv6) { - parsedInfo.ipv6 = addr.local; - } - }); - - parsedInfo.mtu = iface.mtu; - parsedInfo.rxBytes = '%1024mB'.format(iface.stats64.rx.bytes); - parsedInfo.txBytes = '%1024mB'.format(iface.stats64.tx.bytes); - - return parsedInfo; - }); - } catch (e) { - ui.addNotification(null, E('p', {}, _('Error parsing interface info: %s.').format(e.message))); - return []; - } - }, - - pollData(container) { - poll.add(async () => { - const data = await this.load(); - dom.content(container, this.renderContent(data)); - }); - }, - - renderContent(data) { - if (!Array.isArray(data) || data.length === 0) { - return E('div', {}, _('No interface online.')); - } - const rows = [ - E('th', { class: 'th', colspan: '2' }, _('Network Interface Information')) - ]; - data.forEach(interfaceData => { - rows.push( - E('tr', { class: 'tr' }, [ - E('td', { class: 'td left', width: '25%' }, _('Interface Name')), - E('td', { class: 'td left', width: '25%' }, interfaceData.name) - ]), - E('tr', { class: 'tr' }, [ - E('td', { class: 'td left', width: '25%' }, _('IPv4 Address')), - E('td', { class: 'td left', width: '25%' }, interfaceData.ipv4) - ]), - E('tr', { class: 'tr' }, [ - E('td', { class: 'td left', width: '25%' }, _('IPv6 Address')), - E('td', { class: 'td left', width: '25%' }, interfaceData.ipv6) - ]), - E('tr', { class: 'tr' }, [ - E('td', { class: 'td left', width: '25%' }, _('MTU')), - E('td', { class: 'td left', width: '25%' }, interfaceData.mtu) - ]), - E('tr', { class: 'tr' }, [ - E('td', { class: 'td left', width: '25%' }, _('Total Download')), - E('td', { class: 'td left', width: '25%' }, interfaceData.rxBytes) - ]), - E('tr', { class: 'tr' }, [ - E('td', { class: 'td left', width: '25%' }, _('Total Upload')), - E('td', { class: 'td left', width: '25%' }, interfaceData.txBytes) - ]) - ); - }); - - return E('table', { 'class': 'table' }, rows); - }, - - render(data) { - const content = E([], [ - E('h2', { class: 'content' }, _('Tailscale')), - E('div', { class: 'cbi-map-descr' }, _('Tailscale is a cross-platform and easy to use virtual LAN.')), - E('div') - ]); - const container = content.lastElementChild; - - dom.content(container, this.renderContent(data)); - this.pollData(container); - - return content; - }, - - handleSaveApply: null, - handleSave: null, - handleReset: null -}); diff --git a/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/log.js b/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/log.js deleted file mode 100644 index bdb995c33..000000000 --- a/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/log.js +++ /dev/null @@ -1,92 +0,0 @@ -'use strict'; -'require fs'; -'require poll'; -'require ui'; -'require view'; - -return view.extend({ - async retrieveLog() { - const stat = await Promise.all([ - L.resolveDefault(fs.stat('/sbin/logread'), null), - L.resolveDefault(fs.stat('/usr/sbin/logread'), null) - ]); - const logger = stat[0] ? stat[0].path : stat[1] ? stat[1].path : null; - - const logdata = await fs.exec_direct(logger, ['-e', 'tailscale']); - const statusMappings = { - 'daemon.err': { status: 'StdErr', startIndex: 9 }, - 'daemon.notice': { status: 'Info', startIndex: 10 } - }; - const loglines = logdata.trim().split(/\n/).map(function(log) { - const logParts = log.split(' ').filter(Boolean); - if (logParts.length >= 6) { - const formattedTime = `${logParts[1]} ${logParts[2]} - ${logParts[3]}`; - const status = logParts[5]; - const mapping = statusMappings[status] || { status: status, startIndex: 9 }; - const newStatus = mapping.status; - const startIndex = mapping.startIndex; - const message = logParts.slice(startIndex).join(' '); - return `${formattedTime} [ ${newStatus} ] - ${message}`; - } else { - return 'Log is empty.'; - } - }).filter(Boolean); - return { value: loglines.join('\n'), rows: loglines.length + 1 }; - }, - - async pollLog() { - const element = document.getElementById('syslog'); - if (element) { - try { - const log = await this.retrieveLog(); - element.value = log.value; - element.rows = log.rows; - } catch (err) { - ui.addNotification(null, E('p', {}, _('Unable to load log data: ' + err.message))); - } - } - }, - - load() { - poll.add(this.pollLog.bind(this)); - return this.retrieveLog(); - }, - - render(loglines) { - const scrollDownButton = E('button', { - id: 'scrollDownButton', - class: 'cbi-button cbi-button-neutral' - }, _('Scroll to tail', 'scroll to bottom (the tail) of the log file') - ); - scrollDownButton.addEventListener('click', function() { - scrollUpButton.scrollIntoView(); - }); - - const scrollUpButton = E('button', { - id : 'scrollUpButton', - class: 'cbi-button cbi-button-neutral' - }, _('Scroll to head', 'scroll to top (the head) of the log file') - ); - scrollUpButton.addEventListener('click', function() { - scrollDownButton.scrollIntoView(); - }); - - return E([], [ - E('div', { id: 'content_syslog' }, [ - E('div', { style: 'padding-bottom: 20px' }, [scrollDownButton]), - E('textarea', { - id: 'syslog', - style: 'font-size:12px', - readonly: 'readonly', - wrap: 'off', - rows: loglines.rows, - }, [ loglines.value ]), - E('div', { style: 'padding-bottom: 20px' }, [scrollUpButton]) - ]) - ]); - }, - - handleSaveApply: null, - handleSave: null, - handleReset: null -}); diff --git a/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js b/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js deleted file mode 100644 index 2d5462776..000000000 --- a/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js +++ /dev/null @@ -1,380 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-only - * - * Copyright (C) 2024 asvow - */ - -'use strict'; -'require form'; -'require fs'; -'require network'; -'require poll'; -'require rpc'; -'require uci'; -'require view'; - -const callServiceList = rpc.declare({ - object: 'service', - method: 'list', - params: ['name'], - expect: { '': {} } -}); - -async function getInterfaceSubnets(interfaces = ['lan', 'wan']) { - const networks = await network.getNetworks(); - return [...new Set( - networks - .filter(ifc => interfaces.includes(ifc.getName())) - .flatMap(ifc => ifc.getIPAddrs()) - .filter(addr => addr.includes('/')) - .map(addr => { - const [ip, cidr] = addr.split('/'); - const ipParts = ip.split('.').map(Number); - const mask = ~((1 << (32 - parseInt(cidr))) - 1); - const subnetParts = ipParts.map((part, i) => (part & (mask >> (24 - i * 8))) & 255); - return `${subnetParts.join('.')}/${cidr}`; - }) - )]; -} - -async function getStatus() { - const status = { - isRunning: false, - backendState: undefined, - authURL: undefined, - displayName: undefined, - onlineExitNodes: [], - subnetRoutes: [] - }; - const res = await callServiceList('tailscale'); - try { - status.isRunning = res['tailscale']['instances']['instance1']['running']; - } catch (e) { - return status; - } - const tailscaleRes = await fs.exec("/usr/sbin/tailscale", ["status", "--json"]); - const tailscaleStatus = JSON.parse(tailscaleRes.stdout.replace(/("\w+"):\s*(\d+)/g, '$1:"$2"')); - if (!tailscaleStatus.AuthURL && tailscaleStatus.BackendState === "NeedsLogin") { - fs.exec("/usr/sbin/tailscale", ["login"]); - } - status.backendState = tailscaleStatus.BackendState; - status.authURL = tailscaleStatus.AuthURL; - status.displayName = (status.backendState === "Running") ? tailscaleStatus.User[tailscaleStatus.Self.UserID].DisplayName : undefined; - if (tailscaleStatus.Peer) { - status.onlineExitNodes = Object.values(tailscaleStatus.Peer) - .flatMap(peer => (peer.ExitNodeOption && peer.Online) ? [peer.HostName] : []); - status.subnetRoutes = Object.values(tailscaleStatus.Peer) - .flatMap(peer => peer.PrimaryRoutes || []); - } - return status; -} - -function renderStatus(isRunning) { - const spanTemp = '%s %s'; - let renderHTML; - if (isRunning) { - renderHTML = String.format(spanTemp, 'green', _('Tailscale'), _('RUNNING')); - } else { - renderHTML = String.format(spanTemp, 'red', _('Tailscale'), _('NOT RUNNING')); - } - - return renderHTML; -} - -function renderLogin(loginStatus, authURL, displayName) { - const spanTemp = '%s'; - let renderHTML; - if (loginStatus === "NeedsLogin") { - renderHTML = String.format('%s', authURL, _('Need to log in')); - } else if (loginStatus === "Running") { - renderHTML = String.format('%s', 'https://login.tailscale.com/admin/machines', displayName); - renderHTML += String.format('
%s', _('Log out and Unbind')); - } else { - renderHTML = String.format(spanTemp, 'orange', _('NOT RUNNING')); - } - - return renderHTML; -} - -function updateVersionDisplay(data) { - var curEl = document.getElementById('ts_current_ver'); - var latEl = document.getElementById('ts_latest_ver'); - var updBtn = document.getElementById('ts_update_btn'); - if (curEl) curEl.textContent = data.current || 'unknown'; - if (latEl) latEl.textContent = data.latest || 'unknown'; - if (updBtn) { - if (data.current && data.latest && data.current === data.latest) { - updBtn.disabled = true; - updBtn.textContent = _('Already Latest'); - } else if (data.latest && data.latest !== 'unknown') { - updBtn.disabled = false; - updBtn.textContent = _('Update Now'); - } - } -} - -return view.extend({ - load() { - return Promise.all([ - uci.load('tailscale'), - getStatus(), - getInterfaceSubnets() - ]); - }, - - render(data) { - let m, s, o; - const statusData = data[1]; - const interfaceSubnets = data[2]; - const onlineExitNodes = statusData.onlineExitNodes; - const subnetRoutes = statusData.subnetRoutes; - - m = new form.Map('tailscale', _('Tailscale'), _('Tailscale is a cross-platform and easy to use virtual LAN.')); - - s = m.section(form.TypedSection); - s.anonymous = true; - s.render = function () { - poll.add(async function() { - const res = await getStatus(); - const service_view = document.getElementById("service_status"); - const login_view = document.getElementById("login_status_div"); - service_view.innerHTML = renderStatus(res.isRunning); - login_view.innerHTML = renderLogin(res.backendState, res.authURL, res.displayName); - const logoutButton = document.getElementById('logout_button'); - if (logoutButton) { - logoutButton.onclick = function() { - if (confirm(_('Are you sure you want to log out and unbind the current device?'))) { - fs.exec("/usr/sbin/tailscale", ["logout"]); - } - } - } - }); - - return E('div', { class: 'cbi-section', id: 'status_bar' }, [ - E('p', { id: 'service_status' }, _('Collecting data ...')) - ]); - } - - s = m.section(form.NamedSection, 'settings', 'config'); - s.tab('basic', _('Basic Settings')); - - o = s.taboption('basic', form.Flag, 'enabled', _('Enable')); - o.default = o.disabled; - o.rmempty = false; - - o = s.taboption('basic', form.DummyValue, 'login_status', _('Login Status')); - o.depends('enabled', '1'); - o.renderWidget = function(section_id, option_id) { - return E('div', { 'id': 'login_status_div' }, _('Collecting data ...')); - }; - - o = s.taboption('basic', form.Value, 'port', _('Port'), _('Set the Tailscale port number.')); - o.datatype = 'port'; - o.default = '41641'; - o.rmempty = false; - - o = s.taboption('basic', form.Value, 'config_path', _('Workdir'), _('The working directory contains config files, audit logs, and runtime info.')); - o.default = '/etc/tailscale'; - o.rmempty = false; - - o = s.taboption('basic', form.ListValue, 'fw_mode', _('Firewall Mode')); - o.value('nftables', 'nftables'); - o.value('iptables', 'iptables'); - o.default = 'nftables'; - o.rmempty = false; - - o = s.taboption('basic', form.Flag, 'log_stdout', _('StdOut Log'), _('Logging program activities.')); - o.default = o.enabled; - o.rmempty = false; - - o = s.taboption('basic', form.Flag, 'log_stderr', _('StdErr Log'), _('Logging program errors and exceptions.')); - o.default = o.enabled; - o.rmempty = false; - - s.tab('advance', _('Advanced Settings')); - - o = s.taboption('advance', form.Flag, 'accept_routes', _('Accept Routes'), _('Accept subnet routes that other nodes advertise.')); - o.default = o.disabled; - o.rmempty = false; - - o = s.taboption('advance', form.Value, 'hostname', _('Device Name'), _("Leave blank to use the device's hostname.")); - o.default = ''; - o.rmempty = true; - - o = s.taboption('advance', form.Flag, 'accept_dns', _('Accept DNS'), _('Accept DNS configuration from the Tailscale admin console.')); - o.default = o.enabled; - o.rmempty = false; - - o = s.taboption('advance', form.Flag, 'advertise_exit_node', _('Exit Node'), _('Offer to be an exit node for outbound internet traffic from the Tailscale network.')); - o.default = o.disabled; - o.rmempty = false; - - o = s.taboption('advance', form.ListValue, 'exit_node', _('Online Exit Nodes'), _('Select an online machine name to use as an exit node.')); - if (onlineExitNodes.length > 0) { - o.optional = true; - onlineExitNodes.forEach(function(node) { - o.value(node, node); - }); - } else { - o.value('', _('No Available Exit Nodes')); - o.readonly = true; - } - o.default = ''; - o.depends('advertise_exit_node', '0'); - o.rmempty = true; - - o = s.taboption('advance', form.DynamicList, 'advertise_routes', _('Expose Subnets'), _('Expose physical network routes into Tailscale, e.g. 10.0.0.0/24.')); - if (interfaceSubnets.length > 0) { - interfaceSubnets.forEach(function(subnet) { - o.value(subnet, subnet); - }); - } - o.default = ''; - o.rmempty = true; - - o = s.taboption('advance', form.Flag, 'disable_snat_subnet_routes', _('Site To Site'), _('Use site-to-site layer 3 networking to connect subnets on the Tailscale network.')); - o.default = o.disabled; - o.depends('accept_routes', '1'); - o.rmempty = false; - - o = s.taboption('advance', form.DynamicList, 'subnet_routes', _('Subnet Routes'), _('Select subnet routes advertised by other nodes in Tailscale network.')); - if (subnetRoutes.length > 0) { - subnetRoutes.forEach(function(route) { - o.value(route, route); - }); - } else { - o.value('', _('No Available Subnet Routes')); - o.readonly = true; - } - o.default = ''; - o.depends('disable_snat_subnet_routes', '1'); - o.rmempty = true; - - o = s.taboption('advance', form.MultiValue, 'access', _('Access Control')); - o.value('ts_ac_lan', _('Tailscale access LAN')); - o.value('ts_ac_wan', _('Tailscale access WAN')); - o.value('lan_ac_ts', _('LAN access Tailscale')); - o.value('wan_ac_ts', _('WAN access Tailscale')); - o.default = "ts_ac_lan ts_ac_wan lan_ac_ts"; - o.rmempty = true; - - s.tab('extra', _('Extra Settings')); - - o = s.taboption('extra', form.DynamicList, 'flags', _('Additional Flags'), - String.format( - _('List of extra flags. Format: --flags=value, e.g. --exit-node=10.0.0.1.
%s for enabling settings upon the initiation of Tailscale.'), - '' + _('Available flags') + '' - ) - ); - o.default = ''; - o.rmempty = true; - - s = m.section(form.NamedSection, 'settings', 'config'); - s.title = _('Custom Server Settings'); - s.description = String.format(_('Use %s to deploy a private server.'), 'headscale'); - - o = s.option(form.Value, 'login_server', _('Server Address')); - o.default = ''; - o.rmempty = true; - - o = s.option(form.Value, 'authKey', _('Auth Key')); - o.default = ''; - o.rmempty = true; - - /* Core Update Section */ - s = m.section(form.TypedSection); - s.anonymous = true; - s.title = _('Core Update'); - s.description = _('Check and update the Tailscale binary to the latest version.'); - s.render = function() { - return E('div', { class: 'cbi-section' }, [ - E('h3', {}, _('Core Update')), - E('div', { class: 'cbi-value', style: 'margin-bottom: 10px' }, [ - E('label', { class: 'cbi-value-title' }, _('Current Version')), - E('div', { class: 'cbi-value-field' }, [ - E('span', { id: 'ts_current_ver' }, _('Checking...')) - ]) - ]), - E('div', { class: 'cbi-value', style: 'margin-bottom: 10px' }, [ - E('label', { class: 'cbi-value-title' }, _('Latest Version')), - E('div', { class: 'cbi-value-field' }, [ - E('span', { id: 'ts_latest_ver' }, _('Checking...')) - ]) - ]), - E('div', { class: 'cbi-value' }, [ - E('label', { class: 'cbi-value-title' }, ''), - E('div', { class: 'cbi-value-field' }, [ - E('button', { - class: 'btn cbi-button cbi-button-action', - id: 'ts_check_btn', - click: async function(ev) { - ev.preventDefault(); - ev.stopPropagation(); - var btn = ev.target; - btn.disabled = true; - btn.textContent = _('Checking...'); - try { - var res = await fs.exec('/usr/sbin/tailscale_helper', ['check_update']); - if (res.stdout) { - var data = JSON.parse(res.stdout.trim()); - updateVersionDisplay(data); - if (data.error) { - ui.addNotification(null, E('p', {}, data.error)); - } - } - } catch(e) { - ui.addNotification(null, E('p', {}, e.message)); - } - btn.disabled = false; - btn.textContent = _('Check Update'); - } - }, _('Check Update')), - '\u00a0\u00a0', - E('button', { - class: 'btn cbi-button cbi-button-apply', - id: 'ts_update_btn', - click: async function(ev) { - ev.preventDefault(); - ev.stopPropagation(); - var btn = ev.target; - btn.disabled = true; - btn.textContent = _('Updating...'); - try { - var res = await fs.exec('/usr/sbin/tailscale_helper', ['do_update']); - if (res.stdout) { - var data = JSON.parse(res.stdout.trim()); - if (data.success) { - updateVersionDisplay({current: data.version, latest: data.version}); - ui.addNotification(null, E('p', { style: 'color:green' }, - _('Updated successfully to %s').format(data.version))); - } else if (data.error) { - ui.addNotification(null, E('p', {}, _('Update failed: %s').format(data.error))); - btn.disabled = false; - btn.textContent = _('Update Now'); - } - } - } catch(e) { - ui.addNotification(null, E('p', {}, _('Update failed: %s').format(e.message))); - btn.disabled = false; - btn.textContent = _('Update Now'); - } - } - }, _('Update Now')) - ]) - ]) - ]); - }; - - /* Auto check version on page load */ - setTimeout(async function() { - try { - var res = await fs.exec('/usr/sbin/tailscale_helper', ['check_update']); - if (res.stdout) { - var data = JSON.parse(res.stdout.trim()); - updateVersionDisplay(data); - } - } catch(e) {} - }, 1000); - - return m.render(); - } -}); diff --git a/luci-app-tailscale/po/templates/tailscale.pot b/luci-app-tailscale/po/templates/tailscale.pot deleted file mode 100644 index b546effb7..000000000 --- a/luci-app-tailscale/po/templates/tailscale.pot +++ /dev/null @@ -1,295 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:186 -msgid "Accept DNS" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:186 -msgid "Accept DNS configuration from the Tailscale admin console." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:178 -msgid "Accept Routes" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:178 -msgid "Accept subnet routes that other nodes advertise." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:235 -msgid "Access Control" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:245 -msgid "Additional Flags" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:176 -msgid "Advanced Settings" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:128 -msgid "Are you sure you want to log out and unbind the current device?" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:262 -msgid "Auth Key" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:248 -msgid "Available flags" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:141 -msgid "Basic Settings" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:136 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150 -msgid "Collecting data ..." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:255 -msgid "Custom Server Settings" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:182 -msgid "Device Name" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:143 -msgid "Enable" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:47 -msgid "Error parsing interface info: %s." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:190 -msgid "Exit Node" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:208 -msgid "Expose Subnets" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:208 -msgid "" -"Expose physical network routes into Tailscale, e.g. 10.0.0.0/24." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:243 -msgid "Extra Settings" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:162 -msgid "Firewall Mode" -msgstr "" - -#: luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json:14 -msgid "Global Settings" -msgstr "" - -#: luci-app-tailscale/root/usr/share/rpcd/acl.d/luci-app-tailscale.json:3 -msgid "Grant access to Tailscale configuration" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:73 -msgid "IPv4 Address" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:77 -msgid "IPv6 Address" -msgstr "" - -#: luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json:22 -msgid "Interface Info" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:69 -msgid "Interface Name" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:238 -msgid "LAN access Tailscale" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:182 -msgid "Leave blank to use the device's hostname." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:247 -msgid "" -"List of extra flags. Format: --flags=value, e.g. --exit-node=10.0.0.1.
%s for enabling settings upon the initiation of Tailscale." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:90 -msgid "Log out and Unbind" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:168 -msgid "Logging program activities." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:172 -msgid "Logging program errors and exceptions." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:147 -msgid "Login Status" -msgstr "" - -#: luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json:30 -msgid "Logs" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:81 -msgid "MTU" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:77 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:92 -msgid "NOT RUNNING" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:87 -msgid "Need to log in" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:64 -msgid "Network Interface Information" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:201 -msgid "No Available Exit Nodes" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:228 -msgid "No Available Subnet Routes" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:61 -msgid "No interface online." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:190 -msgid "" -"Offer to be an exit node for outbound internet traffic from the Tailscale " -"network." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:194 -msgid "Online Exit Nodes" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:153 -msgid "Port" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:75 -msgid "RUNNING" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/log.js:68 -msgctxt "scroll to top (the head) of the log file" -msgid "Scroll to head" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/log.js:59 -msgctxt "scroll to bottom (the tail) of the log file" -msgid "Scroll to tail" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:194 -msgid "Select an online machine name to use as an exit node." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:222 -msgid "Select subnet routes advertised by other nodes in Tailscale network." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:258 -msgid "Server Address" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:153 -msgid "Set the Tailscale port number." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:217 -msgid "Site To Site" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:172 -msgid "StdErr Log" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:168 -msgid "StdOut Log" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:222 -msgid "Subnet Routes" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:100 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:75 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:77 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:114 -#: luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json:3 -msgid "Tailscale" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:236 -msgid "Tailscale access LAN" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:237 -msgid "Tailscale access WAN" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:101 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:114 -msgid "Tailscale is a cross-platform and easy to use virtual LAN." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:158 -msgid "" -"The working directory contains config files, audit logs, and runtime info." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:85 -msgid "Total Download" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:89 -msgid "Total Upload" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:18 -msgid "Unable to get interface info: %s." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/log.js:45 -msgid "Unable to load log data:" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:256 -msgid "Use %s to deploy a private server." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:217 -msgid "" -"Use site-to-site layer 3 networking to connect subnets on the Tailscale " -"network." -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:239 -msgid "WAN access Tailscale" -msgstr "" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:158 -msgid "Workdir" -msgstr "" diff --git a/luci-app-tailscale/po/zh-cn b/luci-app-tailscale/po/zh-cn deleted file mode 120000 index 8d69574dd..000000000 --- a/luci-app-tailscale/po/zh-cn +++ /dev/null @@ -1 +0,0 @@ -zh_Hans \ No newline at end of file diff --git a/luci-app-tailscale/po/zh_Hans/tailscale.po b/luci-app-tailscale/po/zh_Hans/tailscale.po deleted file mode 100644 index 6ec185139..000000000 --- a/luci-app-tailscale/po/zh_Hans/tailscale.po +++ /dev/null @@ -1,301 +0,0 @@ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: zh_Hans\n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:186 -msgid "Accept DNS" -msgstr "允许DNS" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:186 -msgid "Accept DNS configuration from the Tailscale admin console." -msgstr "使用 Tailscale 管理控制台的 DNS 配置。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:178 -msgid "Accept Routes" -msgstr "启用路由" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:178 -msgid "Accept subnet routes that other nodes advertise." -msgstr "接受其他节点广播的子网路由。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:235 -msgid "Access Control" -msgstr "访问控制" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:245 -msgid "Additional Flags" -msgstr "参数列表" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:176 -msgid "Advanced Settings" -msgstr "高级设置" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:128 -msgid "Are you sure you want to log out and unbind the current device?" -msgstr "是否注销当前登录并且解绑当前设备？" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:262 -msgid "Auth Key" -msgstr "认证密钥" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:248 -msgid "Available flags" -msgstr "可用参数" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:141 -msgid "Basic Settings" -msgstr "基础设置" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:136 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150 -msgid "Collecting data ..." -msgstr "正在收集数据..." - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:255 -msgid "Custom Server Settings" -msgstr "自定义服务器" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:182 -msgid "Device Name" -msgstr "设备名称" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:143 -msgid "Enable" -msgstr "启用" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:47 -msgid "Error parsing interface info: %s." -msgstr "接口信息解析错误：%s。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:190 -msgid "Exit Node" -msgstr "出口节点" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:208 -msgid "Expose Subnets" -msgstr "公开网段" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:208 -msgid "" -"Expose physical network routes into Tailscale, e.g. 10.0.0.0/24." -msgstr "广播子网路由至 Tailscale，例如：10.0.0.0/24。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:243 -msgid "Extra Settings" -msgstr "附加设置" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:162 -msgid "Firewall Mode" -msgstr "防火墙模式" - -#: luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json:14 -msgid "Global Settings" -msgstr "全局设置" - -#: luci-app-tailscale/root/usr/share/rpcd/acl.d/luci-app-tailscale.json:3 -msgid "Grant access to Tailscale configuration" -msgstr "授予访问 Tailscale 配置的权限" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:73 -msgid "IPv4 Address" -msgstr "IPv4地址" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:77 -msgid "IPv6 Address" -msgstr "IPv6地址" - -#: luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json:22 -msgid "Interface Info" -msgstr "接口信息" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:69 -msgid "Interface Name" -msgstr "接口名称" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:238 -msgid "LAN access Tailscale" -msgstr "本地局域网访问虚拟局域网" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:182 -msgid "Leave blank to use the device's hostname." -msgstr "留空以使用设备的主机名。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:247 -msgid "" -"List of extra flags. Format: --flags=value, e.g. --exit-node=10.0.0.1.
%s for enabling settings upon the initiation of Tailscale." -msgstr "额外参数的列表。格式：--flags=value，例如 --exit-node=10.0.0.1。
在 Tailscale 启动时的%s。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:90 -msgid "Log out and Unbind" -msgstr "注销登录并解除绑定" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:168 -msgid "Logging program activities." -msgstr "记录程序运行信息。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:172 -msgid "Logging program errors and exceptions." -msgstr "记录程序错误和警告信息。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:147 -msgid "Login Status" -msgstr "已绑定用户" - -#: luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json:30 -msgid "Logs" -msgstr "日志" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:81 -msgid "MTU" -msgstr "MTU" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:77 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:92 -msgid "NOT RUNNING" -msgstr "未运行" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:87 -msgid "Need to log in" -msgstr "未登录" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:64 -msgid "Network Interface Information" -msgstr "网络接口信息" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:201 -msgid "No Available Exit Nodes" -msgstr "没有可用的出口节点" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:228 -msgid "No Available Subnet Routes" -msgstr "没有可用的子网路由" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:61 -msgid "No interface online." -msgstr "无在线接口。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:190 -msgid "" -"Offer to be an exit node for outbound internet traffic from the Tailscale " -"network." -msgstr "作为 Tailscale 广域网出口节点。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:194 -msgid "Online Exit Nodes" -msgstr "可用出口节点" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:153 -msgid "Port" -msgstr "端口" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:75 -msgid "RUNNING" -msgstr "运行中" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/log.js:68 -msgctxt "scroll to top (the head) of the log file" -msgid "Scroll to head" -msgstr "滚动到顶部" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/log.js:59 -msgctxt "scroll to bottom (the tail) of the log file" -msgid "Scroll to tail" -msgstr "滚动到底部" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:194 -msgid "Select an online machine name to use as an exit node." -msgstr "选择一个可用的节点名称作为出口节点使用。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:222 -msgid "Select subnet routes advertised by other nodes in Tailscale network." -msgstr "选择非本设备广播的子网路由。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:258 -msgid "Server Address" -msgstr "服务器地址" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:153 -msgid "Set the Tailscale port number." -msgstr "设置 Tailscale 端口号。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:217 -msgid "Site To Site" -msgstr "子网互通" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:172 -msgid "StdErr Log" -msgstr "错误日志" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:168 -msgid "StdOut Log" -msgstr "运行日志" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:222 -msgid "Subnet Routes" -msgstr "子网路由" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:100 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:75 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:77 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:114 -#: luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json:3 -msgid "Tailscale" -msgstr "Tailscale" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:236 -msgid "Tailscale access LAN" -msgstr "虚拟局域网访问本地局域网" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:237 -msgid "Tailscale access WAN" -msgstr "虚拟局域网访问本地广域网" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:101 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:114 -msgid "Tailscale is a cross-platform and easy to use virtual LAN." -msgstr "Tailscale 是一个跨平台且易于使用的虚拟局域网 VPN。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:158 -msgid "" -"The working directory contains config files, audit logs, and runtime info." -msgstr "工作目录包含配置文件、审计日志和运行时信息。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:85 -msgid "Total Download" -msgstr "总下载量" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:89 -msgid "Total Upload" -msgstr "总上传量" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:18 -msgid "Unable to get interface info: %s." -msgstr "无法获取接口信息：%s。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/log.js:45 -msgid "Unable to load log data:" -msgstr "无法读取日志数据：" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:256 -msgid "Use %s to deploy a private server." -msgstr "使用 %s 部署私有服务器" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:217 -msgid "" -"Use site-to-site layer 3 networking to connect subnets on the Tailscale " -"network." -msgstr "使用站点到站点的三层网络连接 Tailscale 中的子网。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:239 -msgid "WAN access Tailscale" -msgstr "本地广域网访问虚拟局域网" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:158 -msgid "Workdir" -msgstr "工作目录" diff --git a/luci-app-tailscale/po/zh_Hant/tailscale.po b/luci-app-tailscale/po/zh_Hant/tailscale.po deleted file mode 100644 index fa5a70e7b..000000000 --- a/luci-app-tailscale/po/zh_Hant/tailscale.po +++ /dev/null @@ -1,301 +0,0 @@ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: zh_Hant\n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:186 -msgid "Accept DNS" -msgstr "允許DNS" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:186 -msgid "Accept DNS configuration from the Tailscale admin console." -msgstr "使用 Tailscale 管理控制台的 DNS 設定。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:178 -msgid "Accept Routes" -msgstr "啟用路由" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:178 -msgid "Accept subnet routes that other nodes advertise." -msgstr "接受其他節點廣播的子網路由。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:235 -msgid "Access Control" -msgstr "訪問控制" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:245 -msgid "Additional Flags" -msgstr "參數列表" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:176 -msgid "Advanced Settings" -msgstr "高級設置" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:128 -msgid "Are you sure you want to log out and unbind the current device?" -msgstr "是否註銷當前登錄並且解綁當前設備？" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:262 -msgid "Auth Key" -msgstr "認證密鑰" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:248 -msgid "Available flags" -msgstr "可用參數" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:141 -msgid "Basic Settings" -msgstr "基礎設置" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:136 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150 -msgid "Collecting data ..." -msgstr "正在收集數據..." - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:255 -msgid "Custom Server Settings" -msgstr "自定義伺服器" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:182 -msgid "Device Name" -msgstr "設備名稱" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:143 -msgid "Enable" -msgstr "啟用" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:47 -msgid "Error parsing interface info: %s." -msgstr "接口信息解析錯誤：%s。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:190 -msgid "Exit Node" -msgstr "出口節點" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:208 -msgid "Expose Subnets" -msgstr "公開網段" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:208 -msgid "" -"Expose physical network routes into Tailscale, e.g. 10.0.0.0/24." -msgstr "廣播子網路由至 Tailscale，例如：10.0.0.0/24。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:243 -msgid "Extra Settings" -msgstr "附加設置" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:162 -msgid "Firewall Mode" -msgstr "防火牆模式" - -#: luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json:14 -msgid "Global Settings" -msgstr "全局設置" - -#: luci-app-tailscale/root/usr/share/rpcd/acl.d/luci-app-tailscale.json:3 -msgid "Grant access to Tailscale configuration" -msgstr "授予訪問 Tailscale 配置的權限" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:73 -msgid "IPv4 Address" -msgstr "IPv4地址" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:77 -msgid "IPv6 Address" -msgstr "IPv6地址" - -#: luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json:22 -msgid "Interface Info" -msgstr "接口信息" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:69 -msgid "Interface Name" -msgstr "接口名稱" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:238 -msgid "LAN access Tailscale" -msgstr "本地局域網訪問虛擬局域網" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:182 -msgid "Leave blank to use the device's hostname." -msgstr "留空以使用設備的主機名。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:247 -msgid "" -"List of extra flags. Format: --flags=value, e.g. --exit-node=10.0.0.1.
%s for enabling settings upon the initiation of Tailscale." -msgstr "額外參數的列表。格式：--flags=value，例如 --exit-node=10.0.0.1。
在 Tailscale 啟動時的%s。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:90 -msgid "Log out and Unbind" -msgstr "註銷登錄並解除綁定" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:168 -msgid "Logging program activities." -msgstr "記錄程式運行信息。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:172 -msgid "Logging program errors and exceptions." -msgstr "記錄程式錯誤和警告信息。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:147 -msgid "Login Status" -msgstr "已綁定用戶" - -#: luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json:30 -msgid "Logs" -msgstr "日誌" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:81 -msgid "MTU" -msgstr "MTU" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:77 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:92 -msgid "NOT RUNNING" -msgstr "未運行" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:87 -msgid "Need to log in" -msgstr "未登錄" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:64 -msgid "Network Interface Information" -msgstr "網絡接口信息" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:201 -msgid "No Available Exit Nodes" -msgstr "没有可用的出口節點" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:228 -msgid "No Available Subnet Routes" -msgstr "沒有可用的子網路由" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:61 -msgid "No interface online." -msgstr "無在線接口。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:190 -msgid "" -"Offer to be an exit node for outbound internet traffic from the Tailscale " -"network." -msgstr "作為 Tailscale 廣域網出口節點。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:194 -msgid "Online Exit Nodes" -msgstr "可用出口節點" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:153 -msgid "Port" -msgstr "端口" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:75 -msgid "RUNNING" -msgstr "運行中" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/log.js:68 -msgctxt "scroll to top (the head) of the log file" -msgid "Scroll to head" -msgstr "捲動到頂部" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/log.js:59 -msgctxt "scroll to bottom (the tail) of the log file" -msgid "Scroll to tail" -msgstr "捲動到尾部" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:194 -msgid "Select an online machine name to use as an exit node." -msgstr "選擇一個可用的節點名稱作為出口節點使用。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:222 -msgid "Select subnet routes advertised by other nodes in Tailscale network." -msgstr "選擇非本設備廣播的子網路由。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:258 -msgid "Server Address" -msgstr "伺服器地址" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:153 -msgid "Set the Tailscale port number." -msgstr "設置 Tailscale 端口號。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:217 -msgid "Site To Site" -msgstr "子網互通" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:172 -msgid "StdErr Log" -msgstr "錯誤日誌" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:168 -msgid "StdOut Log" -msgstr "運行日誌" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:222 -msgid "Subnet Routes" -msgstr "子網路由" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:100 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:75 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:77 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:114 -#: luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json:3 -msgid "Tailscale" -msgstr "Tailscale" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:236 -msgid "Tailscale access LAN" -msgstr "虛擬局域網訪問本地局域網" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:237 -msgid "Tailscale access WAN" -msgstr "虛擬局域網訪問本地廣域網" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:101 -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:114 -msgid "Tailscale is a cross-platform and easy to use virtual LAN." -msgstr "Tailscale 是一個跨平台且易於使用的虛擬局域網 VPN。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:158 -msgid "" -"The working directory contains config files, audit logs, and runtime info." -msgstr "工作目錄包含配置文件、審計日誌和運行時信息。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:85 -msgid "Total Download" -msgstr "總下載量" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:89 -msgid "Total Upload" -msgstr "總上傳量" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/interface.js:18 -msgid "Unable to get interface info: %s." -msgstr "無法獲取接口信息：%s。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/log.js:45 -msgid "Unable to load log data:" -msgstr "無法載入日誌檔：" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:256 -msgid "Use %s to deploy a private server." -msgstr "使用 %s 部署私有伺服器" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:217 -msgid "" -"Use site-to-site layer 3 networking to connect subnets on the Tailscale " -"network." -msgstr "使用站點到站點的三層網路連線 Tailscale 中的子網。" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:239 -msgid "WAN access Tailscale" -msgstr "本地廣域網訪問虛擬局域網" - -#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:158 -msgid "Workdir" -msgstr "工作目錄" diff --git a/luci-app-tailscale/root/etc/config/tailscale b/luci-app-tailscale/root/etc/config/tailscale deleted file mode 100644 index 19a5b87ac..000000000 --- a/luci-app-tailscale/root/etc/config/tailscale +++ /dev/null @@ -1,43 +0,0 @@ -config tailscale 'settings' - # Set whether Tailcale is enabled or not - option enabled '0' - # Set the port to listen on for incoming Tailscale packets (default 41641) - option port '41641' - # Path to config file - option config_path '/etc/tailscale' - # Default to using nftables - change below to 'iptables' if still using iptables - option fw_mode 'nftables' - # Enable stdout log - option log_stdout '1' - # Enable stderr log - option log_stderr '1' - # Accept subnet routes that other nodes advertise - #option accept_routes '1' - # Provide a hostname to use for the device instead of the one provided by the OS - #option hostname '' - # Accept DNS configuration from the admin console. (default accept) - option accept_dns '1' - # Offer to be an exit node for outbound internet traffic from the Tailscale network - #option advertise_exit_node '1' - # Provide a Tailscale IP or machine name to use as an exit node - #option exit_node '' - # Expose physical subnet routes to your entire Tailscale network (e.g. 10.0.0.0/24) - #list advertise_routes '' - # Set to '1' to disable subnet route masquerading - #option disable_snat_subnet_routes '1' - # To connect subnets within your tailnet (e.g. 192.168.1.0/24) - # Documentation https://tailscale.com/kb/1214/site-to-site - #list subnet_routes '' - # Set firewall zone (ts_ac_lan: Tailscale access LAN, ts_ac_wan: Tailscale access WAN:, lan_ac_ts: LAN access Tailscale, wan_ac_ts: WAN access Tailscale) - # Documentation https://openwrt.org/docs/guide-user/services/vpn/tailscale/start - #list access 'ts_ac_lan' - #list access 'ts_ac_wan' - #list access 'lan_ac_ts' - #list access 'wan_ac_ts' - # Set extra flags for enabling settings upon the initiation of Tailscale - # Documentation https://tailscale.com/kb/1241/tailscale-up - #list flags '' - # Provide the base URL of a custom server instead of https://controlplane.tailscale.com - #option login_server '' - # Set auth Key of custom server - #option authkey '' diff --git a/luci-app-tailscale/root/etc/hotplug.d/iface/40-tailscale b/luci-app-tailscale/root/etc/hotplug.d/iface/40-tailscale deleted file mode 100755 index 971ed550d..000000000 --- a/luci-app-tailscale/root/etc/hotplug.d/iface/40-tailscale +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -tailscale_enable="$(uci get tailscale.settings.enabled)" - -[ "$ACTION" = ifup -o "$ACTION" = ifupdate ] || exit 0 -[ "$ACTION" = ifupdate -a -z "$IFUPDATE_ADDRESSES" -a -z "$IFUPDATE_DATA" ] && exit 0 -[ "$tailscale_enable" -eq "1" ] || exit 0 -/etc/init.d/tailscale start > /tmp/tailscale.log 2>&1 & diff --git a/luci-app-tailscale/root/etc/init.d/tailscale b/luci-app-tailscale/root/etc/init.d/tailscale deleted file mode 100755 index cc63258ca..000000000 --- a/luci-app-tailscale/root/etc/init.d/tailscale +++ /dev/null @@ -1,155 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=90 - -USE_PROCD=1 - -PROG=/usr/sbin/tailscale_helper -PROGD=/usr/sbin/tailscaled -CONFIG_PATH=/var/lib/tailscale - -service_triggers() { - procd_add_reload_trigger "tailscale" - procd_add_interface_trigger "interface.*.up" wan /etc/init.d/tailscale reload -} - -section_enabled() { - config_get_bool enabled "$1" 'enabled' 0 - [ $enabled -gt 0 ] -} - -tailscale_helper() { - local cfg="$1" - local accept_routes hostname accept_dns advertise_exit_node exit_node advertise_routes disable_snat_subnet_routes subnet_routes access flags login_server authkey std_out std_err - - config_get_bool accept_routes $cfg 'accept_routes' - config_get hostname $cfg 'hostname' - config_get_bool accept_dns $cfg 'accept_dns' - config_get_bool advertise_exit_node $cfg 'advertise_exit_node' - config_get exit_node $cfg 'exit_node' - config_get advertise_routes $cfg 'advertise_routes' - config_get_bool disable_snat_subnet_routes $cfg 'disable_snat_subnet_routes' - config_get subnet_routes $cfg 'subnet_routes' - config_get access $cfg 'access' - config_get flags $cfg 'flags' - config_get login_server $cfg 'login_server' - config_get authkey $cfg 'authkey' - config_get_bool std_out $cfg 'log_stdout' - config_get_bool std_err $cfg 'log_stderr' - - procd_open_instance - procd_set_param command $PROG - - [ "$accept_routes" = "1" ] && procd_append_param command --accept-routes=true - [ -n "$hostname" ] && procd_append_param command --hostname="$hostname" - [ "$accept_dns" = "0" ] && procd_append_param command --accept-dns=false - [ "$advertise_exit_node" = "1" ] && procd_append_param command --advertise-exit-node - [ -n "$exit_node" ] && { - procd_append_param command --exit-node="$exit_node" - procd_append_param command --exit-node-allow-lan-access=true - } - [ -n "$advertise_routes" ] && procd_append_param command --advertise-routes="$(echo $advertise_routes | tr ' ' ',')" - [ "$disable_snat_subnet_routes" = "1" ] && procd_append_param command --snat-subnet-routes=false - [ -n "$flags" ] && procd_append_param command $flags - [ -n "$login_server" ] && procd_append_param command --login-server="$login_server" - [ -n "$authkey" ] && procd_append_param command --authkey="$authkey" - - procd_set_param env \ - ACCEPT_DNS="$accept_dns" \ - EXIT_NODE="$exit_node" \ - SUBNET_ROUTES="$subnet_routes" \ - ACCESS="$access" - - procd_set_param respawn - procd_set_param stdout "$std_out" - procd_set_param stderr "$std_err" - procd_close_instance -} - -start_instance() { - local cfg="$1" - local port config_path fw_mode std_out std_err state_file - - if ! section_enabled "$cfg"; then - echo "disabled in /etc/config/tailscale" - return 1 - fi - - config_get port $cfg 'port' - config_get config_path $cfg 'config_path' - config_get fw_mode $cfg 'fw_mode' - config_get_bool std_out $cfg 'log_stdout' - config_get_bool std_err $cfg 'log_stderr' - - [ -d $config_path ] || mkdir -p $config_path - [ -d $CONFIG_PATH ] || mkdir -p $CONFIG_PATH - state_file="$config_path/tailscaled.state" - - /usr/sbin/tailscaled --cleanup - - procd_open_instance - procd_set_param command $PROGD - - [ -n "$port" ] && procd_append_param command --port "$port" - [ -n "$state_file" ] && procd_append_param command --state "$state_file" - - procd_set_param env TS_DEBUG_FIREWALL_MODE="$fw_mode" - - procd_set_param respawn - procd_set_param stdout "$std_out" - procd_set_param stderr "$std_err" - procd_close_instance - - tailscale_helper "$cfg" -} - -start_service() { - config_load 'tailscale' - config_foreach start_instance 'tailscale' -} - -stop_instance() { - local cfg="$1" - - # Remove dnsmasq settings - MagicDNSSuffix=$(tailscale status --json | awk -F'"' '/"MagicDNSSuffix"/ {last=$(NF-1)} END {print last}') - for suffix in $(uci show dhcp | grep -E "address=.*/${MagicDNSSuffix}/" | sed "s/'//g"); do - uci -q del_list $suffix - done - - # Remove network settings - uci -q delete network.tailscale - uci -q delete network.ts_lan - for route in $(uci show network | grep 'network.ts_subnet[0-9]\+=route' | grep -o 'network.ts_subnet[0-9]\+'); do - uci -q delete $route - done - - # Remove firewall settings - index=$(uci show firewall | grep "firewall.@forwarding\[[0-9]\+\]\.src='lan'" -B 1 -A 1 | grep "firewall.@forwarding\[[0-9]\+\]\.dest='wan'" | grep -o '[0-9]\+') - uci -q delete firewall.@forwarding[$index].enabled - uci -q delete firewall.tszone - uci -q delete firewall.ts_ac_lan - uci -q delete firewall.ts_ac_wan - uci -q delete firewall.lan_ac_ts - uci -q delete firewall.wan_ac_ts - - # Commit configuration changes and reload service - [ -n "$(uci changes dhcp)" ] && uci commit dhcp && /etc/init.d/dnsmasq reload - [ -n "$(uci changes network)" ] && uci commit network && /etc/init.d/network reload - [ -n "$(uci changes firewall)" ] && uci commit firewall && /etc/init.d/firewall reload - - /usr/sbin/tailscaled --cleanup - - # Remove existing link or folder - rm -rf "$CONFIG_PATH" -} - -stop_service() { - config_load 'tailscale' - config_foreach stop_instance 'tailscale' -} - -reload_service() { - stop - start -} diff --git a/luci-app-tailscale/root/etc/uci-defaults/40_luci-tailscale b/luci-app-tailscale/root/etc/uci-defaults/40_luci-tailscale deleted file mode 100755 index 90cd2d6b3..000000000 --- a/luci-app-tailscale/root/etc/uci-defaults/40_luci-tailscale +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@tailscale[-1] - commit ucitrack -EOF - -rm -f /tmp/luci-indexcache -exit 0 diff --git a/luci-app-tailscale/root/usr/sbin/tailscale_helper b/luci-app-tailscale/root/usr/sbin/tailscale_helper deleted file mode 100755 index bd1d54277..000000000 --- a/luci-app-tailscale/root/usr/sbin/tailscale_helper +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh -# Tailscale update helper script - -ARCH=$(uname -m) -case "$ARCH" in - x86_64|amd64) TS_ARCH="amd64" ;; - aarch64|arm64) TS_ARCH="arm64" ;; - armv7l) TS_ARCH="arm" ;; - *) echo '{"error":"unsupported architecture: '$ARCH'"}'; exit 1 ;; -esac - -get_current_version() { - if [ -x /usr/sbin/tailscale ]; then - /usr/sbin/tailscale version 2>/dev/null | head -1 | tr -d '\n' - else - echo "not installed" - fi -} - -check_update() { - CURRENT=$( get_current_version ) - LATEST=$( wget -qO- "https://api.github.com/repos/tailscale/tailscale/releases/latest" 2>/dev/null | \ - grep '"tag_name"' | sed 's/.*"v\([^"]*\)".*/\1/' ) - if [ -z "$LATEST" ]; then - echo "{\"current\":\"$CURRENT\",\"latest\":\"unknown\",\"error\":\"failed to fetch latest version\"}" - else - echo "{\"current\":\"$CURRENT\",\"latest\":\"$LATEST\"}" - fi -} - -do_update() { - LATEST=$( wget -qO- "https://api.github.com/repos/tailscale/tailscale/releases/latest" 2>/dev/null | \ - grep '"tag_name"' | sed 's/.*"v\([^"]*\)".*/\1/' ) - if [ -z "$LATEST" ]; then - echo '{"error":"failed to fetch latest version"}' - exit 1 - fi - - URL="https://pkgs.tailscale.com/stable/tailscale_${LATEST}_${TS_ARCH}.tgz" - TMP_DIR="/tmp/tailscale_update" - rm -rf "$TMP_DIR" - mkdir -p "$TMP_DIR" - - wget -qO "$TMP_DIR/tailscale.tgz" "$URL" 2>/dev/null - if [ ! -s "$TMP_DIR/tailscale.tgz" ]; then - echo "{\"error\":\"download failed: $URL\"}" - rm -rf "$TMP_DIR" - exit 1 - fi - - tar -xzf "$TMP_DIR/tailscale.tgz" -C "$TMP_DIR" 2>/dev/null - EXTRACT_DIR="$TMP_DIR/tailscale_${LATEST}_${TS_ARCH}" - - if [ ! -f "$EXTRACT_DIR/tailscale" ] || [ ! -f "$EXTRACT_DIR/tailscaled" ]; then - echo '{"error":"extracted files not found"}' - rm -rf "$TMP_DIR" - exit 1 - fi - - /etc/init.d/tailscale stop 2>/dev/null - sleep 1 - - cp "$EXTRACT_DIR/tailscale" /usr/sbin/tailscale - cp "$EXTRACT_DIR/tailscaled" /usr/sbin/tailscaled - chmod +x /usr/sbin/tailscale /usr/sbin/tailscaled - - /etc/init.d/tailscale start 2>/dev/null - - rm -rf "$TMP_DIR" - - NEW_VER=$( get_current_version ) - echo "{\"success\":true,\"version\":\"$NEW_VER\"}" -} - -case "$1" in - check_update) check_update ;; - do_update) do_update ;; - *) echo '{"error":"usage: tailscale_helper check_update|do_update"}' ;; -esac diff --git a/luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json b/luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json deleted file mode 100644 index 946749d71..000000000 --- a/luci-app-tailscale/root/usr/share/luci/menu.d/luci-app-tailscale.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "admin/vpn/tailscale": { - "title": "Tailscale", - "order": 90, - "action": { - "type": "firstchild" - }, - "depends": { - "acl": [ "luci-app-tailscale" ], - "uci": { "tailscale": true } - } - }, - "admin/vpn/tailscale/setting": { - "title": "Global Settings", - "order": 10, - "action": { - "type": "view", - "path": "tailscale/setting" - } - }, - "admin/vpn/tailscale/interface": { - "title": "Interface Info", - "order": 20, - "action": { - "type": "view", - "path": "tailscale/interface" - } - }, - "admin/vpn/tailscale/log": { - "title": "Logs", - "order": 30, - "action": { - "type": "view", - "path": "tailscale/log" - } - } -} diff --git a/luci-app-tailscale/root/usr/share/rpcd/acl.d/luci-app-tailscale.json b/luci-app-tailscale/root/usr/share/rpcd/acl.d/luci-app-tailscale.json deleted file mode 100644 index f5ef1cd1c..000000000 --- a/luci-app-tailscale/root/usr/share/rpcd/acl.d/luci-app-tailscale.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "luci-app-tailscale": { - "description": "Grant access to Tailscale configuration", - "read": { - "file": { - "/sbin/ip -s -j ad": [ "exec" ], - "/usr/bin/ip -s -j ad": [ "exec" ], - "/sbin/logread -e tailscale": [ "exec" ], - "/usr/sbin/tailscale status --json": [ "exec" ], - "/usr/sbin/tailscale version": [ "exec" ], - "/usr/sbin/tailscale login": [ "exec" ], - "/usr/sbin/tailscale logout": [ "exec" ], - "/usr/sbin/tailscale_helper": [ "exec" ], - "/usr/sbin/tailscale_helper check_update": [ "exec" ], - "/usr/sbin/tailscale_helper do_update": [ "exec" ] - }, - "ubus": { - "service": [ "list" ] - }, - "uci": [ "tailscale" ] - }, - "write": { - "uci": [ "tailscale" ] - } - } -} diff --git a/luci-app-v2raya/htdocs/luci-static/resources/view/v2raya/config.js b/luci-app-v2raya/htdocs/luci-static/resources/view/v2raya/config.js index df8e3943b..48819f4e7 100644 --- a/luci-app-v2raya/htdocs/luci-static/resources/view/v2raya/config.js +++ b/luci-app-v2raya/htdocs/luci-static/resources/view/v2raya/config.js @@ -2,7 +2,6 @@ 'use strict'; 'require form'; 'require uci'; -'require ui'; 'require view'; return view.extend({ @@ -147,22 +146,5 @@ return view.extend({ o.description = _('Maximum open file descriptors. 16384 is plenty for a home router and bounds a connection flood.'); return m.render(); - }, - - handleSaveApply: function (ev, mode) { - /* - * Applying the UCI delta emits a config.change event; the init - * script's procd reload trigger restarts the service with the new - * values. Restarting here as well would stop and start it twice. - */ - return this.handleSave(ev).then(function () { - return uci.apply(); - }).then(function () { - ui.addNotification(null, E('p', {}, - _('Settings applied. The service is restarting.')), 'info'); - }).catch(function (err) { - ui.addNotification(null, E('p', {}, - _('The configuration was not applied: %s').format(err)), 'danger'); - }); } }); diff --git a/luci-app-v2raya/htdocs/luci-static/resources/view/v2raya/log.js b/luci-app-v2raya/htdocs/luci-static/resources/view/v2raya/log.js index f0ac469f6..309572914 100644 --- a/luci-app-v2raya/htdocs/luci-static/resources/view/v2raya/log.js +++ b/luci-app-v2raya/htdocs/luci-static/resources/view/v2raya/log.js @@ -8,6 +8,7 @@ var LOG_PATH = '/var/log/v2raya/v2raya.log'; var MAX_LINES = 500; +var POLL_INTERVAL = 5; return view.extend({ render: function () { @@ -56,13 +57,13 @@ return view.extend({ }); refresh(); - poll.add(refresh, 5); + poll.add(refresh, POLL_INTERVAL); return E('div', { class: 'cbi-map' }, [ E('h2', {}, _('v2rayA log')), E('div', { class: 'cbi-map-descr' }, _('Showing the last %d lines of %s. Refreshes every %d seconds.') - .format(MAX_LINES, LOG_PATH, L.env.pollinterval || 5)), + .format(MAX_LINES, LOG_PATH, POLL_INTERVAL)), E('div', { class: 'cbi-section' }, [ logEl, E('div', { style: 'margin-top:8px' }, [ refreshBtn, ' ', clearBtn ]) diff --git a/luci-app-v2raya/htdocs/luci-static/resources/view/v2raya/overview.js b/luci-app-v2raya/htdocs/luci-static/resources/view/v2raya/overview.js index f956a5eff..37a186b97 100644 --- a/luci-app-v2raya/htdocs/luci-static/resources/view/v2raya/overview.js +++ b/luci-app-v2raya/htdocs/luci-static/resources/view/v2raya/overview.js @@ -126,14 +126,10 @@ function startService(button) { uci.set('v2raya', 'config', 'enabled', '1'); return L.resolveDefault(uci.save(), null).then(function () { - return runAction('start', button); - }).then(function () { - /* - * Persist enabled=1 so the service also starts after a reboot. - * The resulting config.change event may cause one more restart; - * that is expected after an apply and the page polls the state. - */ + /* Commit before starting: the init script reads enabled from UCI. */ return L.resolveDefault(uci.apply(), null); + }).then(function () { + return runAction('start', button); }); } @@ -231,7 +227,7 @@ return view.extend({ return E('div', { class: 'cbi-map' }, [ E('h2', {}, _('v2rayA')), E('div', { class: 'cbi-map-descr' }, [ - _('A web client for its own Xray-based core, with transparent proxy support.'), + _('A web client for its bundled v2raya_core, with transparent proxy support.'), ' ', E('a', { href: weburl, target: '_blank', rel: 'noreferrer noopener' }, weburl) ]), diff --git a/luci-app-v2raya/root/usr/share/rpcd/acl.d/luci-app-v2raya.json b/luci-app-v2raya/root/usr/share/rpcd/acl.d/luci-app-v2raya.json index 63029ff78..a4ff9ff3d 100644 --- a/luci-app-v2raya/root/usr/share/rpcd/acl.d/luci-app-v2raya.json +++ b/luci-app-v2raya/root/usr/share/rpcd/acl.d/luci-app-v2raya.json @@ -3,7 +3,6 @@ "description": "Grant access to the v2rayA service and configuration", "read": { "file": { - "/etc/init.d/v2raya": [ "exec" ], "/usr/bin/v2raya": [ "exec" ], "/usr/bin/v2raya_core": [ "exec" ], "/usr/libexec/v2raya-detect": [ "exec" ], @@ -16,7 +15,9 @@ }, "write": { "file": { - "/etc/init.d/v2raya": [ "exec" ], + "/etc/init.d/v2raya start": [ "exec" ], + "/etc/init.d/v2raya stop": [ "exec" ], + "/etc/init.d/v2raya restart": [ "exec" ], "/var/log/v2raya/v2raya.log": [ "write" ] }, "uci": [ "v2raya" ] diff --git a/v2raya/Makefile b/v2raya/Makefile index 72d15aab2..0ae1b9768 100644 --- a/v2raya/Makefile +++ b/v2raya/Makefile @@ -14,7 +14,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2raya PKG_VERSION:=2.5.14 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=v2rayA-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)? diff --git a/v2raya/files/v2raya.init b/v2raya/files/v2raya.init index 02f631e03..63c1d4e9e 100644 --- a/v2raya/files/v2raya.init +++ b/v2raya/files/v2raya.init @@ -104,6 +104,17 @@ start_service() { procd_close_instance } +stop_service() { + # v2rayA normally removes its tproxy rules on SIGTERM, but a killed + # process or a proxy-only stop can leave them behind. Remove any + # residual state so stopping the service always restores connectivity. + nft delete table inet v2raya 2>/dev/null + ip rule del fwmark 0x40/0xc0 table 100 2>/dev/null + ip -6 rule del fwmark 0x40/0xc0 table 100 2>/dev/null + ip route flush table 100 2>/dev/null + ip -6 route flush table 100 2>/dev/null +} + reload_service() { # v2rayA does not reload its configuration on SIGHUP; a restart is the # only safe way to apply new UCI values. diff --git a/v2raya/patches/011-clean-residual-transparent-rules.patch b/v2raya/patches/011-clean-residual-transparent-rules.patch new file mode 100644 index 000000000..991689d91 --- /dev/null +++ b/v2raya/patches/011-clean-residual-transparent-rules.patch @@ -0,0 +1,37 @@ +From 14c682ddbca62226c4ca453fcac2d28fae6109c8 Mon Sep 17 00:00:00 2001 +From: Amr Fateem +Date: Wed, 11 Nov 2026 19:56:35 +0200 +Subject: [PATCH] openwrt: clean residual transparent-proxy rules on stop + +When a core process stops, the in-memory transparentOn flag may be +false even though tproxy rules from an earlier process are still +installed. The early return then leaves those rules and the policy +route behind, so all traffic is blackholed once the core is gone. + +Delete the residual rules before returning. The normal path still runs +the transparent-proxy hooks and removes the rules as before. + +Signed-off-by: Amr Fateem +--- + kernel/v2ray/processManager.go | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +--- a/kernel/v2ray/processManager.go ++++ b/kernel/v2ray/processManager.go +@@ -170,9 +170,13 @@ func (m *CoreProcessManager) CheckAndSto + + func (m *CoreProcessManager) checkAndStopTransparentProxy(setting *configure.Setting) { + if !m.transparentOn.Swap(false) { +- // Nothing installed by this process, so nothing to remove and no hook +- // to run. Rules left behind by an earlier process are removed by +- // cleanupResidualTransparentProxyRules when the rules are set up. ++ // Clean residual rules from an earlier process too: after a ++ // restart the in-memory flag is false while the tproxy rules ++ // may still be installed, which blackholes all traffic when ++ // the core stops. ++ if setting != nil && setting.Transparent != configure.TransparentClose { ++ deleteTransparentProxyRules() ++ } + return + } + if setting == nil {