Update vCenter-SSL.ps1

LICENSE

@@ -1,8 +1,232 @@
-MIT License
-Copyright (c) <year> <copyright holders>
+GNU GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+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.
+
+     NodeMgmt
+     Copyright (C) 2018  DCS
+
+     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 <http://www.gnu.org/licenses/>.
+
+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:
+
+     NodeMgmt  Copyright (C) 2018  DCS
+     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 <http://www.gnu.org/licenses/>.
+
+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 <http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -1,4 +1,3 @@
-# NodeMgmt - Galera/NGINX Node Management
-
+# NodeMgmt - Linux Server Node Management
 
     bash <(curl -sL https://go.scity.us/install-nodemgmt)

conf/copycerts.sh.example.inc

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+## Comma-seperated for multiple sites
+local COPYCERT="hostname.domain.com"
+
+## Comma-seperated, in same order as above
+local CERTFOLDER="/local/cert/path"
+
+COPYCERTS_POST_COMMANDS(){
+	##
+	## Commands to run if cert is replaced
+	##
+	
+	SERVICE_MGMT nginx reload
+	
+}
+

conf/defaults.local.example.inc

@@ -0,0 +1,160 @@
+# DEFINE THE ADDRESS FOR THE HOST THAT WILL RUN PRIMARY NODE MANAGEMENT TASKS
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_NODEMANAGER=192.168.1.5
+
+# DEFINE VCENTER INFO TO APPLY SSL CERTS
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_VC_HOSTNAME='vCenter FQDN or LAN IP'
+NM_VC_USER='administrator@vsphere.local'
+NM_VC_PASS='supersecret'
+
+# DEFINE DYNAMIC DNS LOGIN INFO FOR POWER-DNS SERVERS FOR UPDATING RECORDS
+#-----------------------------------------------------------------------------------------------------------------------------------------
+# NM_PDNS_HOST=""
+NM_PDNS_USER=""
+NM_PDNS_PASS=""
+NM_PDNS_APIKEY=""
+NM_DYNDNS_SITES['mainsite']='comma seperated list of DNS A records to update'
+NM_DYNDNS_SITES['offsite']='comma seperated list of DNS A records to update for other site'
+
+# DEFINE PATHS FOR NEW CERTS AND NEW SITES (except proxy sites which default to nginx)
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_CERTPATHS['LB']='/etc/letsencrypt'
+NM_WWWPATHS['WEB']='/var/www'
+
+# DEFIINE NODE TYPES OF THEIR ASSOCIATES HOSTS TO MONITOR (comma seperated)
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_HOSTS['LB']=192.168.1.11,192.168.1.12
+NM_HOSTS['MYSQL']=192.168.1.21,192.168.1.22,192.168.1.23
+NM_HOSTS['WEB']=192.168.1.31,192.168.1.32
+
+# DEFINES NODE TYPE NAMES (THIS LIST ALSO DEFINES WHICH NODE TYPES ARE ENABLED)
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_NODETYPES['LB']='LoadBalancer'
+NM_NODETYPES['MYSQL']='MYSQL'
+# NM_NODETYPES['WEB']='Webserver'.  # MONITORING DISABLED
+
+# DEFINES HOST DESCRIPTIONS FOR CONFIGURED HOSTS
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_HOSTNAMES['192.168.1.31']='Webserver-Node1'
+NM_HOSTNAMES['192.168.1.32']='Webserver-Node2'
+NM_HOSTNAMES['192.168.1.21']='MySQL-Node1'
+NM_HOSTNAMES['192.168.1.22']='MySQL-Node2'
+NM_HOSTNAMES['192.168.1.23']='MySQL-Node3'
+NM_HOSTNAMES['192.168.1.11']='LoadBalancer-Node1'
+NM_HOSTNAMES['192.168.1.12']='LoadBalancer-Node2'
+
+# DEFINES SERVICES TO MONITOR ON EACH HOST PART OF THE NODE TYPE (comma seperated)
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_SERVICES_CHECK['LB']=nginx,haproxy,keepalived
+NM_SERVICES_CHECK['MYSQL']=mariadb,proxysql,keepalived
+NM_SERVICES_CHECK['WEB']=nginx,php7.2-fpm,php7.3-fpm,php7.4-fpm,php8.2-fpm,gitea,keepalived
+
+# DEFINES DOCKERS TO MONITOR ON EACH HOST PART OF THE NODE TYPE (comma seperated)
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_DOCKERS_CHECK['LB']=
+NM_DOCKERS_CHECK['MYSQL']=
+NM_DOCKERS_CHECK['WEB']=phpmyadmin,phppgadmin,vaultwarden,heimdall,authelia
+
+# DEFINES THE CONFIGURED DOCKER COMPOSE CONFIG PATHS, THIS WILL ALLOW NODEMGMT TO TRY AND REBUILD MISSING REQUIRED DOCKERS
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_DOCKER_COMPOSE_LOC['authelia']='/mnt/web-data/authelia'
+NM_DOCKER_COMPOSE_LOC['phpmyadmin']='/mnt/web-data/phpmyadmin'
+NM_DOCKER_COMPOSE_LOC['phppgadmin']='/mnt/web-data/phppgadmin'
+NM_DOCKER_COMPOSE_LOC['vaultwarden']='/mnt/web-data/vaultwarden'
+NM_DOCKER_COMPOSE_LOC['heimdall']='/mnt/web-data/heimdall'
+
+# DEFINES REPLICATED ITEMS FROM BELOW TO MONITOR FOR REPLICATION (comma seperated)
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_REPL_CHECK['LB']=lb-data
+NM_REPL_CHECK['MYSQL']=
+NM_REPL_CHECK['WEB']=web-data
+
+# DEFINES FOLDERS TO BE MONITORED FOR REPLICATION
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_REPL_CHECK_LOC['lb-data']='/opt/lb-data'
+NM_REPL_CHECK_LOC['web-data']='/mnt/web-data'
+
+# DEFINES DESCRIPTIONS FOR REPLICATED FOLDERS
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_REPL_DESC['lb-data']='LB-Data (NGINX / SSL-Certs)'
+NM_REPL_DESC['web-data']='Web Data (NGINX/PHP)'
+
+# DEFINES NGINX PATHS FOR NODE TYPES (ONLY REQUIRED IF PATH IS REPLICATED BETWEEN HOSTS AND IS NEEDED TO BE VERIFIED BEFORE CERTAIN TASKS)
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_REPL_NGINX_PATHS['LB']='/opt/lb-data/nginx'
+NM_REPL_NGINX_PATHS['WEB']='/mnt/web-data/nginx'
+
+# DEFINES SERVICES TO BE MONITORED FOR RUNNING ONLY ON THE HOST CURRENTLY IN PRIMARY CONTROL OF THE NODE TYPE (comma seperated)
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_SINGLESRVR_SERVICES['LB']=
+NM_SINGLESRVR_SERVICES['MYSQL']=
+NM_SINGLESRVR_SERVICES['WEB']=gitea
+
+# DEFINES DOCKERS TO BE MONITORED FOR RUNNING ONLY ON THE HOST CURRENTLY IN PRIMARY CONTROL OF THE NODE TYPE (comma seperated)
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_SINGLESRVR_DOCKERS['LB']=
+NM_SINGLESRVR_DOCKERS['MYSQL']=
+NM_SINGLESRVR_DOCKERS['WEB']=vaultwarden,heimdall,authelia
+
+# DEFINES THE KEEPALIVE IP ADDRESS FOR THE NODE TYPE WHEN USING SINGLE SERVER MONITORING (USED TO VERIFY PRIMARY NODE)
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_SINGLESRVR_IP['LB']=
+NM_SINGLESRVR_IP['MYSQL']=
+NM_SINGLESRVR_IP['WEB']=192.168.1.10
+
+
+# DEFINES THE CONFIGURED SERVICE DESCRIPTIONS
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_SERVICE_DESC['mysql']='MySQL DB Server'
+NM_SERVICE_DESC['mariadb']='MariaDB (MySQL DB Server)'
+NM_SERVICE_DESC['postgresql']='PostgreSQL'
+NM_SERVICE_DESC['apache2']='Apache Web Server'
+NM_SERVICE_DESC['nginx']='NGINX Web Server'
+NM_SERVICE_DESC['gogs']='Gogs Git Repository'
+NM_SERVICE_DESC['gitea']='Gitea Git Repository'
+NM_SERVICE_DESC['haproxy']='HAProxy Load Balancer'
+NM_SERVICE_DESC['keepalived']='Keepalived Load Balancer'
+NM_SERVICE_DESC['maxscale']='MaxScale Load Balancer'
+NM_SERVICE_DESC['cmon']='ClusterControl'
+NM_SERVICE_DESC['cmon-events']='CC-Events Manager'
+NM_SERVICE_DESC['cmon-cloud']='CC-Cloud Daemon'
+NM_SERVICE_DESC['php5.6-fpm']='PHP 5.6 FPM'
+NM_SERVICE_DESC['php7.2-fpm']='PHP 7.2 FPM'
+NM_SERVICE_DESC['php7.3-fpm']='PHP 7.3 FPM'
+NM_SERVICE_DESC['php7.4-fpm']='PHP 7.4 FPM'
+NM_SERVICE_DESC['php8.0-fpm']='PHP 8.0 FPM'
+NM_SERVICE_DESC['php8.1-fpm']='PHP 8.1 FPM'
+NM_SERVICE_DESC['php8.2-fpm']='PHP 8.2 FPM'
+NM_SERVICE_DESC['syncthing']='Syncthing'
+NM_SERVICE_DESC['pdns']='(PowerDNS) DNS Serveice'
+NM_SERVICE_DESC['pdnsadmin']='(PowerDNS) Admin Portal'
+NM_SERVICE_DESC['pdnsadmin.socket']='(PowerDNS) Portal Socket'
+NM_SERVICE_DESC['proxysql']='ProxySQL Load Balancer'
+NM_SERVICE_DESC['glusterd']='Gluster FileSystem'
+NM_SERVICE_DESC['redis-server']='Redis Caching Server'
+NM_SERVICE_DESC['mosquitto']='Mosquitto MQTT Broker'
+NM_SERVICE_DESC['tailscaled']='Tailscale P2P VPN'
+NM_SERVICE_DESC['monitor-power']='Server Power Monitor'
+NM_SERVICE_DESC['monitor-temp']='Server Temp Monitor'
+
+# DEFINES THE CONFIGURED DOCKER DESCRIPTIONS
+#-----------------------------------------------------------------------------------------------------------------------------------------
+NM_DOCKER_DESC['authelia']='Authelia'
+NM_DOCKER_DESC['phpmyadmin']='phpMyAdmin'
+NM_DOCKER_DESC['phppgadmin']='phpPgAdmin'
+NM_DOCKER_DESC['vaultwarden']='VaultWarden'
+NM_DOCKER_DESC['heimdall']='Heimdall'
+NM_DOCKER_DESC['uptime-kuma']='Uptime-Kuma'
+NM_DOCKER_DESC['nginx-proxy_manager']='Nginx Proxy Manager'
+
+
+
+
+
+
+
+
+
+
+

conf/rsyslog/01-ignore-session-messages.conf

@@ -0,0 +1,13 @@
+if (
+    ($syslogtag startswith 'systemd[' or $syslogtag startswith 'systemd-logind[') and
+    (
+        re_match($msg, 'session-') or
+        re_match($msg, 'Started Session') or
+        re_match($msg, 'Deactivated') or
+        re_match($msg, 'Consumed') or
+        re_match($msg, 'New session') or
+        re_match($msg, 'Removed session')
+    )
+) then {
+    stop
+}

conf/ssl-domain-checks.example.conf

@@ -0,0 +1,5 @@
+# domain.name.com PORT
+#
+# example
+# somethingcool.example.com 443
+

defaults.inc

@@ -1,159 +1,185 @@
 #!/usr/bin/env bash
 
-VERS='4.6.23-04302023'
-
-#NODETYPES=WEB,LB
-NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,MM,PW
-MYSQLHOSTS=10.10.1.51,10.10.1.52
-WEBHOSTS=10.10.1.121,10.10.1.122
-LBHOSTS=10.10.10.81,10.10.10.82
-NCHOSTS=10.10.10.42
-WPDHOSTS=100.90.74.120,100.123.225.4,10.10.1.28
-LPDHOSTS=10.10.10.10,10.10.10.11
-MMHOSTS=10.10.1.24
-PRIMARYHOST=10.10.1.51
-MYSQLMANAGER=10.10.10.50
-GLHOSTS=10.10.1.41,10.10.1.42,10.10.1.121,10.10.1.122
-PWHOSTS=10.10.0.240
-
-NODESERVICES=mariadb,mysql,nginx,gitea,pdnsadmin,pdnsadmin.socket,haproxy,keepalived,maxscale,postgresql,web,php5.6-fpm,php7.2-fpm,php7.3-fpm,php7.4-fpm,syncthing,pdns,proxysql,radarr,sonarr,jackett,qbittorrent,snap.tautulli.tautulli,ombi,glusterd,redis-server,mosquitto
-MYSQLSERVICES_CHECK=mariadb,proxysql,keepalived
-WEBSERVICES_CHECK=nginx,php5.6-fpm,php7.2-fpm,php7.3-fpm,php7.4-fpm,php8.2-fpm,gitea,keepalived
-LBSERVICES_CHECK=nginx,haproxy,keepalived
-NCSERVICES_CHECK=nginx,php8.1-fpm,redis-server
-WPDSERVICES_CHECK=pdns,mariadb,pdnsadmin,pdnsadmin.socket,proxysql
-LPDSERVICES_CHECK=pdns,mariadb,pdnsadmin,pdnsadmin.socket,keepalived
-MMSERVICES_CHECK=radarr,sonarr,jackett,qbittorrent,snap.tautulli.tautulli,ombi,nginx,php8.2-fpm
-PWSERVICES_CHECK=mosquitto
-
-WEBDOCKER=phpmyadmin,phppgadmin
-#LBDOCKER=nginx-proxy_manager
-
-noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck '
-CERT_DAEMON='/snap/bin/certbot'
-FOLDER=/opt/idssys/nodemgmt
-TMPFOLDER=${FOLDER}/.tmp
-SCRIPT=${FOLDER}/nodemgmt-scripts.sh
-LOGFILE=${FOLDER}/logfile
-RENOTIFY=900
-
-[ ! -d ${TMPFOLDER} ] && mkdir ${TMPFOLDER}
+VERS='5.6.52-11192025'
+NM_BETA=false
 
 
-NM_SRVCOPT=(start stop restart reload enable disable)
-
-#MYSQL_REPL_CHECK=( )
-#WEB_REPL_CHECK=(nginx www ssl lessh php pma pdnsa)
-WEB_REPL_CHECK=( web-data )
-LB_REPL_CHECK=( lb-data )
-#NC_REPL_CHECK=(apache nextcloud-php nextcloud-data)
-#NC_REPL_CHECK=( )
-
-
-
-declare -A NM_HOSTNAMES
-NM_HOSTNAMES['10.10.1.121']='Webserver-Node1'
-NM_HOSTNAMES['10.10.1.122']='Webserver-Node2'
-NM_HOSTNAMES['10.10.1.51']='MySQL-Node1'
-NM_HOSTNAMES['10.10.1.52']='MySQL-Node2'
-NM_HOSTNAMES['10.10.10.81']='LB-Node1'
-NM_HOSTNAMES['10.10.10.82']='LB-Node2'
-NM_HOSTNAMES['10.10.10.10']='DNS-Node1'
-NM_HOSTNAMES['10.10.10.11']='DNS-Node2'
-NM_HOSTNAMES['10.10.10.42']='Nextcloud-Server'
-NM_HOSTNAMES['159.203.158.51']='PowerDNS-Node1'
-NM_HOSTNAMES['146.190.1.194']='PowerDNS-Node3'
-NM_HOSTNAMES['10.10.10.50']='MySQL-Manager'
-NM_HOSTNAMES['10.10.0.240']='PowerWall'
-NM_HOSTNAMES['100.90.74.120']='WAN-DNS1 (East)'
-NM_HOSTNAMES['100.123.225.4']='WAN-DNS2 (West)'
-
+noheader=' test service status-check nightlyrephp7.3-fpm,new backup report reportrun check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck offsite-staticroute-fix '
 
 declare -i errtime
+[ "${NM_FOLDER}" == "" ] && NM_FOLDER=/opt/idssys/nodemgmt
+NM_SRVCOPT=(start stop restart reload enable disable)
 
-IFS=,
-NODE_TYPES=(${NODETYPES})
-MYSQL_HOSTS=(${MYSQLHOSTS})
-WEB_HOSTS=(${WEBHOSTS})
-LB_HOSTS=(${LBHOSTS})
-NC_HOSTS=(${NCHOSTS})
-WPD_HOSTS=(${WPDHOSTS})
-LPD_HOSTS=(${LPDHOSTS})
-MM_HOSTS=(${MMHOSTS})
-GL_HOSTS=(${GLHOSTS})
-PW_HOSTS=(${PWHOSTS})
+# TSI=$(/sbin/ip link | grep tailscale0)
+# [ ${#TSI} != 0 ] && RUN_NODE_TSIP=$(/sbin/ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) || RUN_NODE_TSIP=""
 
-NODE_SERVICES=(${NODESERVICES})
-MYSQL_SERVICES_CHECK=(${MYSQLSERVICES_CHECK})
-WEB_SERVICES_CHECK=(${WEBSERVICES_CHECK})
-LB_SERVICES_CHECK=(${LBSERVICES_CHECK})
-NC_SERVICES_CHECK=(${NCSERVICES_CHECK})
-WPD_SERVICES_CHECK=(${WPDSERVICES_CHECK})
-LPD_SERVICES_CHECK=(${LPDSERVICES_CHECK})
-MM_SERVICES_CHECK=(${MMSERVICES_CHECK})
-PW_SERVICES_CHECK=(${PWSERVICES_CHECK})
-LOCAL_SERVICES=(${LOCAL_SERVICES})
 
-WEB_DOCKER=(${WEBDOCKER})
-LB_DOCKER=(${LBDOCKER})
+if [ "$(ip route | awk '/default/ { print $5 }')" == "link" ]; then
+	RNIP=$(ip addr show $(ip route | awk '/1 dev eth0/ { print $5; exit }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
+elif [ "$(ip a | awk '/wg0/')" ]; then
+	RNIP=$(ip a | awk '/wg0/' | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1)
+else
+	RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
+fi
 
-unset IFS
+if [ -f ${NM_FOLDER}/conf/defaults.local.inc ]; then
+	declare -A NM_HOSTS
+	declare -A NM_SERVICES_CHECK
+	declare -A NM_DOCKERS_CHECK
+	declare -A NM_REPL_CHECK
+	declare -A NM_REPL_NGINX_PATHS
+	declare -A NM_HOSTNAMES
+	declare -A NM_NODETYPES
+	declare -A NM_SERVICE_DESC
+	declare -A NM_DOCKER_DESC
+	declare -A NM_DOCKER_COMPOSE_LOC
+	declare -A NM_REPL_CHECK_LOC
+	declare -A NM_REPL_DESC
+	declare -A NM_SINGLESRVR_SERVICES
+	declare -A NM_SINGLESRVR_DOCKERS
+	declare -A NM_SINGLESRVR_IP
+	declare -A NM_CERTPATHS
+	declare -A NM_WWWPATHS
+	declare -A NM_DYNDNS_SITES
+	declare -A NM_HOST_CPULEVELS
+	
+	source ${NM_FOLDER}/conf/defaults.local.inc
+	
+	[ "${NM_REPL_CHECK_TIMEOUT}" != "" ] && NM_REPL_CHECK_TIMEOUT=${NM_REPL_CHECK_TIMEOUT} || NM_REPL_CHECK_TIMEOUT=5   #MINUTES
+	[ "${CERT_DAEMON}" == "" ] && CERT_DAEMON='/opt/certbot/bin/certbot'
 
-declare -A NM_NODETYPES
-NM_NODETYPES['MYSQL']='MySQL'
-NM_NODETYPES['LB']='LoadBalance'
-NM_NODETYPES['WEB']='Webserver'
-NM_NODETYPES['NC']='Nextcloud'
-NM_NODETYPES['WPD']='WAN PowerDNS'
-NM_NODETYPES['LPD']='LAN PowerDNS'
-NM_NODETYPES['MM']='Media Manager'
-NM_NODETYPES['PW']='PowerWall'
+	
+	IFS=,
+	LOCAL_SERVICES=(${LOCAL_SERVICES})
+	unset IFS
+	
+	NODETYPES=$(for k in "${!NM_NODETYPES[@]}"; do echo "${NM_NODETYPES["$k"]} ${k}"; done | sort -f | while read desc nmtype; do echo ${nmtype}; done)
+	IFS=$'\n' NM_NODE_TYPES=(${NODETYPES}); unset IFS
+	# printf "[%s]\n" "${NM_NODE_TYPES[@]}"
+			
+	for ntype in "${NM_NODE_TYPES[@]}"; do
+		arr ${ntype}_HOSTS
+		arr ${ntype}_SERVICES_CHECK
+		arr ${ntype}_DOCKERS_CHECK
+		arr ${ntype}_REPL_CHECK
+		arr ${ntype}_SINGLESRVR_SERVICES
+		arr ${ntype}_SINGLESRVR_DOCKERS
+		arr ${ntype}_SINGLESRVR_IP
+		
+		IFS=,; var=(${NM_HOSTS[${ntype}]}); unset IFS
+		for value in "${var[@]}"; do
+			arr_insert ${ntype}_HOSTS $value
+		done
+		
+		if [ "${NM_SERVICES_CHECK[${ntype}]}" != "" ]; then
+			IFS=,; var=(${NM_SERVICES_CHECK[${ntype}]}); unset IFS
+			for value in "${var[@]}"; do
+				arr_insert ${ntype}_SERVICES_CHECK $value
+			done
+		fi
+		
+		if [ "${NM_DOCKERS_CHECK[${ntype}]}" != "" ]; then
+			IFS=,; var=(${NM_DOCKERS_CHECK[${ntype}]}); unset IFS
+			for value in "${var[@]}"; do
+				arr_insert ${ntype}_DOCKERS_CHECK $value
+			done
+			arr_insert ${ntype}_DOCKERS_CHECK watchtower
+			([[ "${RNIP}" != "10.6."* ]] && [ "${ntype}" != "ESPH" ]) && arr_insert ${ntype}_DOCKERS_CHECK portainer_agent
+		fi
+		
+		if [ "${NM_REPL_CHECK[${ntype}]}" != "" ]; then
+			IFS=,; var=(${NM_REPL_CHECK[${ntype}]}); unset IFS
+			for value in "${var[@]}"; do
+				arr_insert ${ntype}_REPL_CHECK $value
+			done
+		fi
+		
+		if [ "${NM_SINGLESRVR_SERVICES[${ntype}]}" != "" ]; then
+			IFS=,; var=(${NM_SINGLESRVR_SERVICES[${ntype}]}); unset IFS
+			for value in "${var[@]}"; do
+				arr_insert ${ntype}_SINGLESRVR_SERVICES $value
+			done
+		fi
+		
+		if [ "${NM_SINGLESRVR_DOCKERS[${ntype}]}" != "" ]; then
+			IFS=,; var=(${NM_SINGLESRVR_DOCKERS[${ntype}]}); unset IFS
+			for value in "${var[@]}"; do
+				arr_insert ${ntype}_SINGLESRVR_DOCKERS $value
+			done
+		fi
+		
+		if [ "${NM_SINGLESRVR_IP[${ntype}]}" != "" ]; then
+			IFS=,; var=(${NM_SINGLESRVR_IP[${ntype}]}); unset IFS
+			for value in "${var[@]}"; do
+				arr_insert ${ntype}_SINGLESRVR_IP $value
+			done
+		# else
+		# 	declare "${ntype}_SINGLESRVR_IP"=""
+		fi
+	done
+	
+fi
 
-declare -A NM_SERVICES
-NM_SERVICES['mysql']='MySQL'
-NM_SERVICES['mariadb']='MariaDB (MySQL)'
-NM_SERVICES['postgresql']='PostgreSQL'
-NM_SERVICES['apache2']='Apache Web Server'
-NM_SERVICES['nginx']='NGINX Web Server'
-NM_SERVICES['gogs']='Gogs Git Repository'
-NM_SERVICES['gitea']='Gitea Git Repository'
-NM_SERVICES['haproxy']='HAProxy Load Balancer'
-NM_SERVICES['keepalived']='Keepalived Load Balancer'
-NM_SERVICES['maxscale']='MaxScale Load Balancer'
-NM_SERVICES['cmon']='CC-Controller'
-NM_SERVICES['cmon-events']='CC-Events Manager'
-NM_SERVICES['cmon-cloud']='CC-Cloud Daemon'
-NM_SERVICES['php5.6-fpm']='PHP 5.6 FPM'
-NM_SERVICES['php7.2-fpm']='PHP 7.2 FPM'
-NM_SERVICES['php7.3-fpm']='PHP 7.3 FPM'
-NM_SERVICES['php7.4-fpm']='PHP 7.4 FPM'
-NM_SERVICES['php8.0-fpm']='PHP 8.0 FPM'
-NM_SERVICES['php8.1-fpm']='PHP 8.1 FPM'
-NM_SERVICES['php8.2-fpm']='PHP 8.2 FPM'
-NM_SERVICES['syncthing']='Syncthing'
-NM_SERVICES['pdns']='PowerDNS Server'
-NM_SERVICES['pdnsadmin']='PowerDNS-Admin'
-NM_SERVICES['pdnsadmin.socket']='PowerDNS-Admin Socket'
-NM_SERVICES['proxysql']='ProxySQL Load Balancer'
-NM_SERVICES['radarr']='Radarr'
-NM_SERVICES['sonarr']='Sonarr'
-NM_SERVICES['jackett']='Jackett'
-NM_SERVICES['qbittorrent']='qBittorrent'
-NM_SERVICES['snap.tautulli.tautulli']='Tautulli'
-NM_SERVICES['ombi']='Ombi'
-NM_SERVICES['glusterd']='Gluster FileSystem'
-NM_SERVICES['redis-server']='Redis Caching Server'
-NM_SERVICES['mosquitto']='Mosquitto MQTT Broker'
+[ "${NM_FOLDER}" == "" ] && NM_FOLDER=/opt/idssys/nodemgmt
+[ "${NM_BACKUP_FOLDER}" == "" ] && NM_BACKUP_FOLDER=/opt/idssys/backups
+NM_SCRIPT=${NM_FOLDER}/nodemgmt-scripts.sh
+NM_TMPFOLDER=${NM_FOLDER}/.tmp
+PW_TMPFOLDER=${NM_TMPFOLDER}/powerwall
+[ "${NM_LOGFOLDER}" == "" ] && NM_LOGFOLDER=${NM_FOLDER}/logs
+NM_LOGFILE=${NM_LOGFOLDER}/logfile
 
-declare -A NM_DOCKERS
-NM_DOCKERS['phpmyadmin']='phpMyAdmin'
-NM_DOCKERS['phppgadmin']='phpPgAdmin'
-NM_DOCKERS['nginx-proxy_manager']='Nginx Proxy Manager'
+[ ! -d ${NM_TMPFOLDER} ] && mkdir ${NM_TMPFOLDER}
+[ ! -d ${NM_LOGFOLDER} ] && mkdir ${NM_LOGFOLDER}
 
-declare -A NM_DOCKER_COMPOSE
-NM_DOCKER_COMPOSE['phpmyadmin']='/mnt/web-Data/phpmyadmin'
-NM_DOCKER_COMPOSE['phppgadmin']='/mnt/web-Data/phppgadmin'
-NM_DOCKER_COMPOSE['nginx-proxy_manager']='/opt/nginx-proxy'
+[ "${NM_RENOTIFY_TIMEOUT}" == "" ] && NM_RENOTIFY_TIMEOUT=3600
+[ "${NM_ENABLE_RENOTIFY}" == "" ] && NM_ENABLE_RENOTIFY=1
+
+NM_PDNS_WANDNS='wdns.scity.us'
+NM_PDNS_LANDNS='ldns.scity.us'
+
+
+if [ "${RNIP}" == "${NM_NODEMANAGER}" ]; then
+	IS_NODEMANAGER=1
+# 	RUN_NODE_TYPE=NM;
+# 	RUN_NODE_IP=${RNIP}
+else
+	IS_NODEMANAGER=0
+fi
+	for NTYPE in "${NM_NODE_TYPES[@]}"; do
+		# if [ "${1}" != "service" ] || ([ "${1}" == "service" ] && ([[ "${NM_SERVICES_CHECK[${NTYPE}]}" = *"${2}"* ]] || [ "${NTYPE}" == "${2^^}" ])); then
+			var=${NTYPE}_HOSTS[@]
+			RUN_NODE_TYPE=""
+			for nip in "${!var}"; do
+				# echo "${NTYPE} - $nip - ${RNIP} - ${RUN_NODE_TSIP}"
+				if [[ "${RNIP}" == *"${nip}"* ]]; then
+					RUN_NODE_TYPE=${NTYPE};
+					RUN_NODE_IP=${RNIP}
+					break 2
+				# elif [[ "${RUN_NODE_TSIP}" == *"${nip}"* ]]; then
+				# 	RUN_NODE_TYPE=${NTYPE};
+				# 	RUN_NODE_IP=${RNIP}
+				# 	break 2
+				fi
+			done
+		# fi
+	done
+# fi
+# echo "HERE1: RUN_NODE_TYPE=$RUN_NODE_TYPE RUN_NODE_IP=$RUN_NODE_IP  RUN_NODE_TSIP=$RUN_NODE_TSIP (RNIP=$RNIP  TSI=$TSI)"
+
+
+[ "${NM_REPL_NGINX_PATHS}" != "" ] && [ "${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_NGINXPATH=${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]} || NM_NGINXPATH=/etc/nginx
+if [ "${NM_CERTPATHS}" != "" ]; then
+	if [ "${NM_CERTPATHS[${RUN_NODE_TYPE}]}" != "" ]; then
+		NM_CERTPATH=${NM_CERTPATHS[${RUN_NODE_TYPE}]}
+		NM_CERTNODE=${RUN_NODE_TYPE}
+	else
+		NM_CERTPATH=${NM_CERTPATHS[@]}
+		NM_CERTNODE=${!NM_CERTPATHS[@]}
+	fi
+else
+	NM_CERTPATH=/etc/letsencrypt
+fi
+[ "${NM_WWWPATHS}" != "" ] && [ "${NM_WWWPATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_WWWPATH=${NM_WWWPATHS[${RUN_NODE_TYPE}]} || NM_WWWPATH=/var/www
 
 declare -A NM_SRVCOPTS
 NM_SRVCOPTS['status']='Status'
@@ -165,52 +191,30 @@ NM_SRVCOPTS['enable']='Enabl'
 NM_SRVCOPTS['disable']='Disabl'
 NM_SRVCOPTS['daemon-reload']='Daemon-Reload'
 
+declare -A NM_BACKUP_ITEMS
+NM_BACKUP_ITEMS['nginx-settings']=${NM_NGINXPATH}
+NM_BACKUP_ITEMS['nginx-logs']=/var/log/nginx
+NM_BACKUP_ITEMS['letsencrypt-certs']=${NM_CERTPATH}
+NM_BACKUP_ITEMS['webserver-files']=${NM_WWWPATH}
+NM_BACKUP_ITEMS['haproxy']=/etc/haproxy
+NM_BACKUP_ITEMS['keepalived']=/etc/keepalived
+NM_BACKUP_ITEMS['fail2ban']=/etc/fail2ban
+NM_BACKUP_ITEMS['nmg-conf']=${NM_FOLDER}/conf
+# NM_BACKUP_ITEMS[nginx]=/
 
-declare -A REPL_CHECKS
-REPL_CHECKS['apache']='/etc/apache2'
-REPL_CHECKS['nginx']='/mnt/web-data/nginx'
-REPL_CHECKS['nginxproxy']='/opt/nginx-proxy'
-REPL_CHECKS['lb-data']='/opt/lb-data'
-REPL_CHECKS['ssl']='/mnt/web-data/letsencrypt'
-REPL_CHECKS['lessh']='/home/le/.ssh'
-REPL_CHECKS['php']='/mnt/web-data/php'
-REPL_CHECKS['www']='/mnt/web-data/www'
-REPL_CHECKS['web-data']='/mnt/web-data'
-REPL_CHECKS['git']='/mnt/web-data/gitea'
-REPL_CHECKS['gitssh']='/home/git'
-REPL_CHECKS['pma']='/mnt/web-data/phpmyadmin'
-REPL_CHECKS['pdnsa']='/mnt/web-data/powerdns-admin'
-REPL_CHECKS['nextcloud-data']='/mnt/Nextcloud-Data'
-REPL_CHECKS['nextcloud-php']='/etc/php'
+NM_MEDIA_SERVICES="radarr,radarr3d,sonarr,prowlarr,qbittorrent,bazarr,snap.tautulli.tautulli,snap.overseerr.daemon,jackett,lidarr,ombi"
 
-declare -A REPL_DESC
-REPL_DESC['apache']='Apache Settings'
-REPL_DESC['nginx']='NGINX Settings'
-REPL_DESC['nginxproxy']='NGINX-Proxy Settings'
-REPL_DESC['lb-data']='LB-Data (NGINX / SSL-Certs)'
-REPL_DESC['ssl']='SSL Certificates'
-REPL_DESC['lessh']='LetsEncrypt SSH Keys'
-REPL_DESC['php']='PHP Settings'
-REPL_DESC['www']='Webserver Files'
-REPL_DESC['web-data']='Web Data (NGINX/PHP)'
-REPL_DESC['git']='Gitea System'
-REPL_DESC['gitssh']='Gitea SSH Keys'
-REPL_DESC['pma']='phpMyAdmin Settings'
-REPL_DESC['pdnsa']='PowerDNS Admin'
-REPL_DESC['nextcloud-data']='Nextcloud Data'
-REPL_DESC['nextcloud-php']='Nextcloud PHP Settings'
-
-declare -A BACKUP_ITEMS
-BACKUP_ITEMS[nginx-settings]=/etc/nginx
-BACKUP_ITEMS[letsencrypt-certs]=/etc/letsencrypt
-BACKUP_ITEMS[gitea]=/var/lib/gitea
-BACKUP_ITEMS[nginx-logs]='/var/www/!NGINX-Logs'
-#BACKUP_ITEMS[webserver-files]=/var/www
+for NTYPE in "${NM_NODE_TYPES[@]}"; do
+	if [[ "${NM_DOCKERS_CHECK[${NTYPE}]}" == *"authelia"* ]]; then
+		NM_AUTHELIA_IP=${NM_SINGLESRVR_IP[${NTYPE}]}
+		break
+	fi
+done
 
 GET-CHECKCERT-DOMAINS(){
 	declare -A CHECKCERT_DOMAINS
 	IFS=$'\n'
-	for LINE in `egrep -v '(^#|^$)' ${FOLDER}/ssl-cert-check/ssldomains`; do
+	for LINE in `egrep -v '(^#|^$)' ${NM_FOLDER}/conf/ssl-domain-checks.conf`; do
 	    HOST=${LINE%% *}
 	    PORT=${LINE#* }
 	    IFS=" "
@@ -224,70 +228,29 @@ DISP_HEADER(){
 	if [ "$1" = true ]; then
 		clear
 	fi
-	echo ""
+	echo 
 	echo -e "${idsCL[LightGreen]} NodeMgmt - Node Monitoring & Management${idsCL[Default]}  ${idsCL[DarkGray]}(ver-${VERS})${idsCL[Default]}"
 	DIVIDER . lightGreen
-	if [ "$2" = true ]; then
-		echo -e " Node hostname     : ${idsST[Bold]}${idsCL[LightCyan]}${NODE_HOSTNAME}${idsCL[Default]}${idsST[Reset]}"
-		if [ -z ${LOCAL_SERVICES+x} ]; then SERVICES=$( IFS=$','; echo "${NODE_SERVICES[*]}" )
-			else SERVICES=$( IFS=$','; echo "${LOCAL_SERVICES[*]}" )
-		fi
-		IFS=,; SERVICES2=(${SERVICES}); unset IFS
-		for srvc in "${SERVICES2[@]}"; do
-			c=0; cw=18; spc=''
-			spc1=${cw}-${#NM_SERVICES[${srvc}]}
-			until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
-			echo -en " ${NM_SERVICES[${srvc}]}$spc: "
-			if [ $(pgrep ${srvc} | wc -l) -gt "0" ]; then
-				echo -e "${idsCL[Green]}Running${idsCL[Default]}"
-				else echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
-			fi
-		done
-		DIVIDER
-		if [ $(ls -1 ${FOLDER}/*.lastrun 2>/dev/null | wc -l) != 0 ];then
-			echo -e "${idsST[Bold]}Lastrun Items:${idsST[Reset]}"
-			for lastrun in ${FOLDER}/*.lastrun ; do
-				IFS='/'; lastrun_item=(${lastrun}); unset IFS
-				lastrun_item=$(echo ${lastrun_item[4]} | sed "s/.lastrun//g")
-				lastrun_item=$(echo ${lastrun_item} | sed "s/-/ /g")
-				lastrun_date=$(stat -c %y ${lastrun})
-				IFS=' '; lastrun_date=(${lastrun_date}); unset IFS
-				IFS='.'; lastrun_time=(${lastrun_date[1]}); unset IFS
-				c=0; cw=18; spc=''
-				spc1=${cw}-${#lastrun_item}
-				until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
-				echo -e " ${lastrun_item~}${spc}: ${lastrun_date[0]} ${lastrun_time}"
-			done
-			
-			DIVIDER
-		fi
-	fi
-	echo ""
+	echo 
 }
 
-CERT-CHECK(){
-	TARGET="mysite.example.net"; 
-	RECIPIENT="hostmaster@mysite.example.net";
-	DAYS=7;
-	echo "checking if $TARGET expires in less than $DAYS days";
-	expirationdate=$(date -d "$(: | openssl s_client -connect $TARGET:443 -servername $TARGET 2>/dev/null \
-	                              | openssl x509 -text \
-	                              | grep 'Not After' \
-	                              |awk '{print $4,$5,$7}')" '+%s'); 
-	in7days=$(($(date +%s) + (86400*$DAYS)));
-	if [ $in7days -gt $expirationdate ]; then
-	    echo "KO - Certificate for $TARGET expires in less than $DAYS days, on $(date -d @$expirationdate '+%Y-%m-%d')" \
-	    | mail -s "Certificate expiration warning for $TARGET" $RECIPIENT ;
+CHECK_HOST_QC(){
+	if [ ! -z ${1+x} ]; then
+		ping -qw 2 -c 1 ${1} > /dev/null 2>&1
+		[ $? -ne 0 ] && echo false || echo true
 	else
-	    echo "OK - Certificate expires on $expirationdate";
+		echo false
 	fi
 }
 
 SENDNOTICE(){
-	[ "${PUSHOVER_APP_TOKEN}" != "" ] && PUSH_TO_MOBILE "${2}
+	if [ "${PUSHOVER_USER_TOKEN}" != "" ]; then
+		SN_TIT="$(echo -e "${1}" | sed "s/\%/\%25 /g")"
+		SN_MSG="$(echo -e "${2}" | sed "s/\%/\%25 /g")"
+		PUSH_TO_MOBILE "${SN_MSG}
 
-$(date)" "${1}" ${3} &
-	
+[${NM_HOSTNAMES[${RNIP}]}] $(date)" "${SN_TIT}" ${3} &
+	fi
 	[ "${EMAIL_NOTICE}" != "" ] && echo -e "${2}\n\n$(date)" | mail -s "${1}" ${EMAIL_NOTICE}
 	
 }

inc/certs.inc

@@ -1,14 +1,45 @@
 #!/usr/bin/env bash
 
+CERTAUTH="--webroot --webroot-path ${NM_CERTPATH}/letsencrypt-acme-challenge"
+CERTSERVER="https://acme-v02.api.letsencrypt.org/directory"
+CERTCHAIN="ISRG Root X1"
+
 NEWCERT(){
-	echo
-	if [ -z ${1+x} ]; then
-		echo -e -n "${idsCL[LightCyan]}Create certificate for what name (comma seperated for mutiple) : ${idsCL[Default]}"
-		read NEW_CERT
-		echo
-	else
+	CERTTEST=0; CERTEXPAND=""; CERTENC='ecdsa'; NONGINXRESTART=0
+	if [ "${3}" != "" ] && ([ "${3}" == "0" ] || [ "${3}" == "1" ]); then
 		NEW_CERT=${1}
+		NEWSITE=${2}
+		CERTTEST=${3}
+	else
+		while [ $# -gt 0 ]; do
+			case "${1}" in
+				-t|-test) CERTTEST=1;;
+				-newsite) NEWSITE=true;;
+				-expand) CERTEXPAND='--expand';;
+				-rsa) CERTENC='rsa';;
+				-nnr) NONGINXRESTART=1;;
+				-h|-help|--help)
+					echo -e "Usage: ${idsCL[Yellow]}[nodemgmt or nmg] newcert {hostname}${idsCL[Default]} {"
+					width=35
+					printf "%-${width}s- %s\n" "    {hostname}" "(optional: enter hostname for new cert, comma-delimited for multiple)"
+					printf "%-${width}s- %s\n" "    -rsa" "(request rsa cert instead of default ecdsa)"
+					printf "%-${width}s- %s\n" "    -t|-test" "(enables dry-run mode for CertBot)"
+					echo -e "}\n"
+					exit 0;;
+				*) NEW_CERT=${1};;
+			esac
+			shift
+		done
 	fi
+	if [ "${NEW_CERT}" == "" ]; then
+		until [ "${NEW_CERT}" != "" ]; do
+			echo -en "\n${idsCL[LightCyan]}Create certificate for what name (comma seperated for mutiple) : ${idsCL[Default]}"
+			read NEW_CERT
+			echo
+		done
+	fi
+	echo
+
 	if [[ ${NEW_CERT} == *","* ]]; then
 		IFS=','; NEW_CERTS=(${NEW_CERT}); unset IFS
 		MAIN_CERT=${NEW_CERTS[0]}
@@ -16,78 +47,64 @@ NEWCERT(){
 		MAIN_CERT=${NEW_CERT}
 	fi
 	if [ "${NEW_CERT}" != "" ]; then
+		if [ ${CERTTEST} -eq 1 ]; then
+			echo -e "${idsCL[LightYellow]}${idsST[Bold]}### REQUESTING CERT IN TEST MODE ###${idsST[Reset]}${idsCL[Default]}"
+			echo 
+		fi
+		
+		if [ "${NM_PDNS_APIKEY}" != "" ] && [ "${NM_PDNS_RP_HOSTNAME}" != "" ]; then
+			echo -en "${idsCL[LightCyan]}Verifying WAN DNS record ... "
+			CERTDOMAIN=$(echo ${MAIN_CERT} |awk -F. '{$1="";OFS="." ; print $0}' | sed 's/^.//' | sed 's/ /./g')
+			if [ "$(curl -sH "Content-Type: application/json" -H "X-API-Key: ${NM_PDNS_APIKEY}" https://${NM_PDNS_WANDNS}/api/v1/servers/localhost/zones/${CERTDOMAIN} | jq | grep "${MAIN_CERT}")" != "" ]; then
+				#UPDATE
+				cDATA="{\"rrsets\": [ {\"name\": \"${MAIN_CERT}.\", \"type\": \"CNAME\", \"ttl\": 3600, \"changetype\": \"REPLACE\", \"records\": [ {\"content\": \"${NM_PDNS_RP_HOSTNAME}.\", \"disabled\": false, \"name\": \"${MAIN_CERT}.\", \"ttl\": 3600, \"type\": \"CNAME\"}]}]}"
+				curl -H 'Content-Type: application/json' -X PATCH --data "${cDATA}" -H "X-API-Key: ${NM_PDNS_APIKEY}" https://${NM_PDNS_WANDNS}/api/v1/servers/localhost/zones/${CERTDOMAIN}
+			else
+				#ADD
+				cDATA="{\"rrsets\": [ {\"name\": \"${MAIN_CERT}.\", \"type\": \"CNAME\", \"ttl\": 3600, \"changetype\": \"REPLACE\", \"records\": [ {\"content\": \"${NM_PDNS_RP_HOSTNAME}.\", \"disabled\": false } ] } ] }"
+				curl -H 'Content-Type: application/json' -X PATCH --data "${cDATA}" -H "X-API-Key: ${NM_PDNS_APIKEY}" https://${NM_PDNS_WANDNS}/api/v1/servers/localhost/zones/${CERTDOMAIN}
+			fi
+			echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
+			echo	
+		fi
+		
 		echo -e "${idsCL[LightGreen]}Requesting Certificate for '${idsCL[Yellow]}${NEW_CERT}${idsCL[LightGreen]}'...${idsCL[Default]}"
-		echo ""
+		echo 
 		
-		# echo -en "${idsCL[LightYellow]}Stopping other Webservers... ${idsCL[Default]}"
-		# for nip in "${WEB_HOSTS[@]}"; do
-		# 	if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]]; then
-		# 		# `ssh root@${nip} service nginx stop`
-		# 		# SERVICE nginx stop ${nip}
-		# 	fi
-		# done
-		# echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
-		# echo
-		
-		$CERT_DAEMON certonly --webroot -w /opt/lb-data/letsencrypt-acme-challenge -d ${NEW_CERT}
-		# $CERT_DAEMON certonly --dry-run --webroot -w /var/www/html -d ${NEW_CERT}
-		
-		chown -R root:le /opt/lb-data/letsencrypt
-		chmod -R 6775 /opt/lb-data/letsencrypt
-		
-		if [ -d /opt/lb-data/letsencrypt/live/${MAIN_CERT} ]; then
-
-			touch /opt/lb-data/letsencrypt/live/${MAIN_CERT}/newcert
-			if [ -f /opt/lb-data/nginx/sites-enabled/${MAIN_CERT}.conf ]; then
-				rm -f  ${FOLDER}/cert-request.lastrun
-				daterun=`date +%Y-%m-%d-%H-%M-%S`
-				echo -e "${NEW_CERT}\n${daterun}" > ${FOLDER}/cert-request.lastrun
-				yes | cp -rfH ${FOLDER}/cert-request.lastrun /opt/lb-data/letsencrypt/cert-request.lastrun
-				DIVIDER true
-				echo -e -n "${idsCL[LightCyan]}Reload NGINX on LB Nodes (Y/n): ${idsCL[Default]}"
-				read -n 1 NGINXRELOAD
-				if [[ ${NGINXRELOAD} =~ ^[Nn]$ ]]; then
-					tmp=''
-				else
-					echo
-					echo -en "${idsCL[LightYellow]}Waiting for Cert replication across the nodes... ${idsCL[Default]}"
-					for nip in "${LB_HOSTS[@]}"; do
-						checkhost=$(CHECK_HOST ${nip})
-						if [ "${checkhost}" != "false" ]; then
-							if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]]; then
-								checked=false
-								until [ "${checked}" = "" ]; do
-									checked=`ssh root@${nip} "[ ! -f /opt/lb-data/letsencrypt/live/${MAIN_CERT}/newcert ] && echo '.'"`
-								done
-							fi
-						fi
-					done
-					rm -f /opt/lb-data/letsencrypt/live/${MAIN_CERT}/newcert
-					echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
+		[ ${CERTTEST} -eq 1 ] && DRYRUN='--dry-run' || DRYRUN=''
+		${CERT_DAEMON} --authenticator dns-pdns --dns-pdns-credentials ${NM_FOLDER}/conf/pdns-credentials.conf certonly ${CERTEXPAND} ${DRYRUN} --key-type ${CERTENC} --server ${CERTSERVER} --preferred-chain "${CERTCHAIN}" -d ${NEW_CERT}
 				
-					echo
-					SERVICE nginx reload
+		chown -R root:le ${NM_CERTPATH}
+		chmod -R 6775 ${NM_CERTPATH}
+		
+		if [ -d ${NM_CERTPATH}/live/${MAIN_CERT} ]; then
+			echo -e "$(date +%Y-%m-%d-%H-%M-%S) - ${NEW_CERT}" >> ${NM_LOGFOLDER}/cert.requests
+			if [ -f ${NM_NGINXPATH}/sites-enabled/${MAIN_CERT}.conf ]; then
+				sed -i "s/#ssl_certificate/ssl_certificate/g" ${NM_NGINXPATH}/sites-available/${MAIN_CERT}.conf
+				sed -i "s/#listen 443/listen 443/g" ${NM_NGINXPATH}/sites-available/${MAIN_CERT}.conf
+				sed -i "s/#include conf.d\/include\/ssl-ciphers.conf/include conf.d\/include\/ssl-ciphers.conf/g" ${NM_NGINXPATH}/sites-available/${MAIN_CERT}.conf
+				sed -i "s/#include conf.d\/include\/force-ssl.conf/include conf.d\/include\/force-ssl.conf/g" ${NM_NGINXPATH}/sites-available/${MAIN_CERT}.conf				
+				DIVIDER true
+				
+				if [ ${NONGINXRESTART} -eq 0 ]; then
+					# if [[ "${RUN_NODE_IP}" != "10.6.1"* ]]; then
+						SERVICE_MGMT nginx restart
+					# else
+					# 	/bin/systemctl restart nginx
+					# fi
 				fi
 			fi
 			echo
 			echo -e "${idsCL[Green]}Certificate has been successfully created for '${idsCL[Yellow]}${NEW_CERT}${idsCL[Green]}'...${idsCL[Default]}"
+		elif [ ${CERTTEST} -eq 1 ]; then
+			echo -e "${idsCL[Yellow]}Ran in Test Mode, did not generate SSL for '${idsCL[LightCyan]}${NEW_CERT}${idsCL[Yellow]}'...${idsCL[Default]}"
 		else
 			echo
 			echo -e "${idsCL[Red]}Certificate could not be created for '${idsCL[Yellow]}${NEW_CERT}${idsCL[Red]}'...${idsCL[Default]}"
 		fi
 		
-		# echo
-		# echo -en "${idsCL[LightYellow]}Starting other Webservers... ${idsCL[Default]}"
-		# for nip in "${WEB_HOSTS[@]}"; do
-		# 	if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]]; then
-		# 		`ssh root@${nip} service nginx start`
-		# 		# SERVICE nginx start ${nip}
-		# 	fi
-		# done
-		# echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
-		
-		echo ""
-		if [ -z $action ] || [ "${action}" = "gui" ]; then
+		echo 
+		if [ -z ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then
 			DIVIDER true
 			ENTER2CONTINUE
 		fi
@@ -101,127 +118,143 @@ NEWCERT(){
 
 DEL-SSL(){
 	if [ -z ${1+x} ]; then
-		echo -e -n "${idsCL[LightCyan]}Delete what SSL site address: ${idsCL[Default]}"
-		read DEL_SSL
-		echo ""
+		until [ "${DEL_SSL}" != "" ]; do
+			echo -e -n "${idsCL[LightCyan]}Delete what SSL site address: ${idsCL[Default]}"
+			read DEL_SSL
+			echo
+		done
 	else
 		DEL_SSL=${1}
 	fi
 	if [ ! -z ${DEL_SSL+x} ] && [ "${DEL_SSL}" != "" ]; then
-		if [ -d /etc/letsencrypt/live/${DEL_SSL} ]; then 
+		if [ -d ${NM_CERTPATH}/live/${DEL_SSL} ]; then 
 			echo -e "${idsCL[LightRed]}Deleting the SSL certificates for '${idsCL[Red]}${DEL_SSL}${idsCL[LightRed]}'...${idsCL[Default]}"
-			echo ""
+			echo 
 	
 			echo -en "${idsCL[LightRed]}Removing Files and Folders... ${idsCL[Default]}"
-			rm -rf /etc/letsencrypt/archive/${DEL_SSL}
-			rm -rf /etc/letsencrypt/live/${DEL_SSL}
-			rm -f /etc/letsencrypt/renewal/${DEL_SSL}.conf
-			echo -e "${idsCL[Green]}OK${idsCL[Default]}"
-			echo ""
-		
-			
+			rm -rf ${NM_CERTPATH}/archive/${DEL_SSL} >/dev/null 2&>1
+			rm -rf ${NM_CERTPATH}/live/${DEL_SSL} >/dev/null 2&>1
+			rm -f ${NM_CERTPATH}/renewal/${DEL_SSL}.conf >/dev/null 2&>1
+			[ -f ${NM_FOLDER}/conf/ssl-domain-checks.conf ] && sed -i "/${SUBJECT}/d" ${NM_FOLDER}/conf/ssl-domain-checks.conf >/dev/null 2&>1
+			echo -e "${idsCL[Green]}OK${idsCL[Default]}"		
+			echo -e "\n${idsCL[LightRed]}The SSL certificate has been fully removed from the node(s).${idsCL[Default]}"
 		else
-			echo -e "${idsCL[LightRed]}The SSL files folder for '${idsCL[Red]}${DEL_SSL}${idsCL[LightRed]}' could not be found.${idsCL[Default]}"
-			exit 1
+			echo -e "\n${idsCL[LightRed]}The SSL files folder for '${idsCL[Red]}${DEL_SSL}${idsCL[LightRed]}' could not be found.${idsCL[Default]}"
 		fi
-		if [ "${timeout}" != "true" ]; then
-			echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
-		fi
-		echo
-		# SERVICE nginx reload
-		echo -e "${idsCL[LightRed]}The SSL certificate has been removed fromt be nodes.${idsCL[Default]}"
+
 	fi
 }
 
 CERTRENEW(){
-	echo -en "${idsCL[LightCyan]}Stopping Webserver-Node2...${idsCL[Default]}"
-	ssh root@webserver-node2.scity.us service nginx stop
-	echo -e "${idsCL[LightGreen]} Completed${idsCL[Default]}"
 	echo
 	echo -e "${idsCL[LightGreen]}Renewing Certificates...${idsCL[Default]}"
 	echo
 	sleep 5
-	$CERT_DAEMON renew --webroot -w /var/www/html 2>&1 | tee ${FOLDER}/cert-renewal.lastrun
-	# $CERT_DAEMON renew --force-renewal  --preferred-chain "ISRG Root X1" --webroot -w /var/www/html 2>&1 | tee ${FOLDER}/cert-renewal.lastrun
-    # $CERT_DAEMON --dry-run  --preferred-chain "ISRG Root X1" renew --webroot -w /var/www/html 2>&1 | tee ${FOLDER}/cert-renewal.lastrun
+	mv -f ${NM_LOGFOLDER}/cert-renewal1.lastrun ${NM_LOGFOLDER}/cert-renewal2.lastrun >/dev/null 2>&1
+	mv -f ${NM_LOGFOLDER}/cert-renewal.lastrun ${NM_LOGFOLDER}/cert-renewal1.lastrun >/dev/null 2>&1
+	
+	# ${CERT_DAEMON} renew ${CERTAUTH} > ${NM_LOGFOLDER}/cert-renewal.lastrun
+	${CERT_DAEMON} --authenticator dns-pdns --dns-pdns-credentials ${NM_FOLDER}/conf/pdns-credentials.conf renew > ${NM_LOGFOLDER}/cert-renewal.lastrun
+	
+	
 	CONCAT_SSL
-	chown -R root:letsencrypt /etc/letsencrypt 2>&1 | tee -a ${FOLDER}/cert-renewal.lastrun
-	chmod -R 6775 /etc/letsencrypt 2>&1 | tee -a ${FOLDER}/cert-renewal.lastrun
-	yes | cp -rfH ${FOLDER}/cert-renewal.lastrun /etc/letsencrypt/cert-renewal.lastrun
+	chown -R root:le ${NM_CERTPATH} >> ${NM_LOGFOLDER}/cert-renewal.lastrun
+	chmod -R 6775 ${NM_CERTPATH} >> ${NM_LOGFOLDER}/cert-renewal.lastrun
+	
 	daterun=`date +%Y-%m-%d-%H-%M-%S`
-	echo -e "${daterun}" >> /etc/letsencrypt/cert-renewal.lastrun
+	echo -e "${daterun}" >> ${NM_LOGFOLDER}/cert-renewal.lastrun
 	DIVIDER true
-	echo -en "${idsCL[LightCyan]}Starting Webserver-Node2 Back up...${idsCL[Default]}"
-	ssh root@webserver-node2.scity.us service nginx start
-	echo -e "${idsCL[LightGreen]} Completed${idsCL[Default]}"
 	echo
-	SERVICE nginx reload 2>&1 | tee -a ${FOLDER}/cert-renewal.lastrun
+	
+	SERVICE_MGMT nginx reload >> ${NM_LOGFOLDER}/cert-renewal.lastrun
+	
 	echo -e "${idsCL[LightGreen]}The certificates have been renewed.${idsCL[Default]}"
-	echo ""
-	if [ -z $action ] || [ "${action}" = "gui" ]; then
+	echo 
+	if [ -z ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then
 		DIVIDER true
 		ENTER2CONTINUE
 	fi
 }
 NIGHTLYRENEW(){
-	rm -f ${FOLDER}/cert-renewal.lastrun
-	ssh root@webserver-node2.scity.us service nginx stop
-	sleep 5
-	$CERT_DAEMON renew --webroot -w /var/www/html &>> ${FOLDER}/cert-renewal.lastrun
+	${CERT_DAEMON} --authenticator dns-pdns --dns-pdns-credentials ${NM_FOLDER}/conf/pdns-credentials.conf renew
 	CONCAT_SSL
-	chown -R root:letsencrypt /etc/letsencrypt &>> ${FOLDER}/cert-renewal.lastrun
-	chmod -R 6775 /etc/letsencrypt &>> ${FOLDER}/cert-renewal.lastrun
-	yes | cp -rfH ${FOLDER}/cert-renewal.lastrun /etc/letsencrypt/cert-renewal.lastrun
-	daterun=`date +%Y-%m-%d-%H-%M-%S`
-	echo -e "${daterun}" >> /etc/letsencrypt/cert-renewal.lastrun
-	ssh root@webserver-node2.scity.us service nginx start
-	SERVICE nginx reload web &>> ${FOLDER}/cert-renewal.lastrun
+	chown -R root:le ${NM_CERTPATH}
+	chmod -R 6775 ${NM_CERTPATH}
+	SERVICE_MGMT nginx reload
 }
 
 CONCAT_SSL(){
 	rm -f /tmp/ssllist
-	for certdir in /etc/letsencrypt/live/*/ ; do echo $certdir; done > /tmp/ssllist
+	for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done > /tmp/ssllist
 	for certdir in $(</tmp/ssllist); do
 		rm -f ${certdir}fullcert.pem
-		cat ${certdir}privkey.pem ${certdir}fullchain.pem > ${certdir}fullcert.pem
+		# cat ${certdir}privkey.pem ${certdir}fullchain.pem > ${certdir}fullcert.pem
 	done
 }
 
 LISTCERTS(){
-	declare -i cw; declare -i spc1; declare -i c
-	declare -A CHECKCERT_DOMAINS
-	IFS=$'\n'
-	for LINE in `egrep -v '(^#|^$)' ${FOLDER}/ssl-cert-check/ssldomains`; do
-	    HOST=${LINE%% *}
-	    PORT=${LINE#* }
-	    IFS=" "
-		CHECKCERT_DOMAINS[${HOST}]=${PORT}
+	EDIT=0; SEARCH=0
+	while [ $# -gt 0 ]; do
+		case "${1}" in
+			-e|-edit) EDIT=1;;
+			-s|-search) SEARCH=${2};;
+			-h | -help | --help)
+				echo -e "Usage: ${idsCL[Yellow]}[nodemgmt or nmg] certs${idsCL[Default]} {"
+				width=35
+				printf "%-${width}s- %s\n" "    -e|-edit" "(enables edit mode)"
+				printf "%-${width}s- %s\n" "    -s|-search {search}" "(narrows list to cert names containing {search})"
+				echo -e "}\n"
+				exit 0;;
+		esac
+		shift
 	done
-	unset IFS
-	if [ ! -z ${LOCAL_SERVICES+x} ]; then
-		NCMD="ssh root@${MYSQL_HOSTS[0]}"
-		#${NCMD} rm -f /tmp/ssllist
-		#${NCMD} 'for certdir in /etc/letsencrypt/live/*/ ; do echo $certdir; done' > /tmp/ssllist
-	else
+	declare -i cw; declare -i spc1; declare -i c; declare -A CHECKCERT_DOMAINS
+	if [ -f ${NM_FOLDER}/conf/ssl-domain-checks.conf ]; then
+		
+		IFS=$'\n'
+		for LINE in `egrep -v '(^#|^$)' ${NM_FOLDER}/conf/ssl-domain-checks.conf`; do
+		    HOST=${LINE%% *}
+		    PORT=${LINE#* }
+		    IFS=" "
+			CHECKCERT_DOMAINS[${HOST}]=${PORT}
+		done
+		unset IFS
+	fi
+	
+	# if [ ! -z ${LOCAL_SERVICES+x} ]; then
+	# 	NCMD="${SSHCMD} root@${NM_HOSTS['LB'][0]}"
+	# 	#${NCMD} rm -f /tmp/ssllist
+	# 	#${NCMD} 'for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done' > /tmp/ssllist
+	# else
 		NCMD=''
 		rm -f /tmp/ssllist
-		#for certdir in /etc/letsencrypt/live/*/ ; do echo $certdir; done > /tmp/ssllist
-	fi
-	if [ -z $action ] || [ "${action}" = "gui" ]; then
+	# 	#for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done > /tmp/ssllist
+	# fi
+	if [ -z ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then
 		DIVIDER true
 	fi
-	echo 
-	echo -e "${idsCL[LightGreen]}Current Certificates on Node...${idsCL[Default]}"
-	DIVIDER false yellow 120
-	echo -e "Subject Name               Monitored   Expires      Alternate Subject Names"
-	DIVIDER false yellow 120
+	echo -e "\033[K${idsCL[LightGreen]}Current Certificates on Node...${idsCL[Default]}"
 	
-	cw=30; 
+	cw=34; 
 	c=0; spc2=''; until [ $c = ${cw} ]; do spc2="${spc2} "; c=`expr $c + 1`; done
+	[ ${EDIT} -eq 1 ] && lenh="##) " || lenh=""
 	
-	#ssldir=$(${NCMD} find /opt/nginx-proxy/ssl/* -type l)
-	ssldir=$(${NCMD} find /opt/lb-data/letsencrypt/live/* -type d)
+	if [ "${SEARCH}" != "0" ]; then
+		ssldir=$(${NCMD} find ${NM_CERTPATH}/live/*${SEARCH,,}* -type d)
+	else
+		ssldir=$(${NCMD} find ${NM_CERTPATH}/live/* -type d)
+	fi
+	
+	i=1
 	for certdir in ${ssldir[@]}; do
+		if (( i % 12 == 0 )) || [ $i = 1 ]; then
+			DIVIDER false yellow 120
+			echo -e "${lenh}${idsCL[Yellow]}Subject Name                   Monitored   Expires      Alternate Subject Names${idsCL[Default]}"
+			DIVIDER false yellow 120
+		else
+			DIVIDER false darkGray 120
+		fi		
+		
 		SUBJECT=$(${NCMD} openssl x509 -in ${certdir}/cert.pem -noout -subject|grep -oP '(?<=CN = )[^,]+'|sort -uV)
 		SUBJECTNAMES=$(${NCMD} openssl x509 -in ${certdir}/cert.pem -noout -text|grep -oP '(?<=DNS:|IP Address:)[^,]+'|sort -uV)
 		CERTEXPIRE=$(date -d "$(: | ${NCMD} openssl x509 -in ${certdir}/cert.pem -text | grep 'Not After' |awk '{print $4,$5,$7}')" '+%s');
@@ -239,38 +272,218 @@ LISTCERTS(){
 		until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 		if [ $CERTEXPIRE -le $DUEIN ]; then
 			date="${idsST[Bold]}${idsCL[Red]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsST[Reset]}${idsCL[Default]}"
-			SENDNOTICE "SSL Expiring" "${SUBJECT} expires on ${date}" 1
+			SENDNOTICE "SSL Expiring" "${SUBJECT} expires on $(date -d @${CERTEXPIRE} '+%m-%d-%Y')" 1
 		else
 			date="${idsCL[Green]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsCL[Default]}"
 		fi
 		
-		if [ "${CHECKCERT_DOMAINS[${SUBJECT}]}" = "" ]; then
-			monitored='No '
-		else
-			monitored="${idsCL[Green]}Yes${idsCL[Default]}"
-		fi
+		[ "${CHECKCERT_DOMAINS[${SUBJECT}]}" != "" ] && monitored="${idsCL[Green]}Yes${idsCL[Default]}" || monitored='No '
+		
+		[ ${i} -lt 10 ] && ii=" ${i}" || ii=${i}
+		[ ${EDIT} -eq 1 ] && len="${ii}) " || len=""
+		
 		if [ ${#SUBJECT_NAMES[@]} -lt 4 ]; then
-			echo -e "${idsCL[Cyan]}${SUBJECT}${idsCL[Default]}${spc}${monitored}     ${date}    ${SUBJECTNAMES}"
+			echo -e "${len}${idsCL[Cyan]}${SUBJECT}${idsCL[Default]}${spc}${monitored}     ${date}    ${SUBJECTNAMES}"
 		elif [ ${#SUBJECT_NAMES[@]} -lt 7 ]; then
-			echo -e "${idsCL[Cyan]}${SUBJECT}${idsCL[Default]}${spc}${monitored}     ${date}    ${SUBJECT_NAMES[0]}, ${SUBJECT_NAMES[1]}, ${SUBJECT_NAMES[2]}"
-			echo -e "${spc2}                      ${SUBJECT_NAMES[3]}, ${SUBJECT_NAMES[4]}, ${SUBJECT_NAMES[5]}"
-
+			echo -e "${len}${idsCL[Cyan]}${SUBJECT}${idsCL[Default]}${spc}${monitored}     ${date}    ${SUBJECT_NAMES[0]}, ${SUBJECT_NAMES[1]}, ${SUBJECT_NAMES[2]}"
+			echo -n "${spc2}                      "
+			for sn in {3..5}; do
+				if [ "${SUBJECT_NAMES[${sn}]}" != "" ]; then
+					[ ${sn} -ne 3 ] && echo -n ", "
+					echo -n ${SUBJECT_NAMES[${sn}]}
+				fi
+			done
+			echo
 		fi
-		DIVIDER false darkGray 120
+		
+		CERTLIST[${i}]=${SUBJECT}
+		i=`expr $i + 1`
 	done
+	
+	if [ ${EDIT} -eq 1 ]; then
+		echo
+		DIVIDER . yellow ${dl}
+		function exitspacing {
+			echo -e "\n\033[K\n\033[K"
+			exit 0
+		}
+		trap exitspacing EXIT
+		
+		while [ "${editc^}" != "E" ]; do
+			echo -e "\033[K"
+			echo -e "\033[K"
+			echo -e "\033[K (${idsCL[Green]}A${idsCL[Default]})dd New Cert, (${idsCL[Green]}R${idsCL[Default]})eload Certs, (${idsCL[Yellow]}E${idsCL[Default]})xit"
+			echo -e "\033[K"
+			echo -e "\033[K"
+			echo -e "\033[K"
+			echo -e "\033[7A"
+			echo -en "\033[K${idsCL[LightCyan]}Enter the cert number you want to edit: ${idsCL[Default]}"
+			read certid
+			echo
+			
+			if [ "${certid^}" == "E" ]; then
+				echo -e "\033[K"
+				exit 0
+				
+			elif [ "${certid^}" == "A" ]; then
+				echo -en "\033[1A\033[K\r"
+				NEWCERT
+				[ "${SEARCH}" != "0" ] && LISTCERTS -edit -search ${SEARCH} || LISTCERTS -edit
+				exit 0
+				
+			elif [ "${certid^}" == "R" ]; then
+				[ "${SEARCH}" != "0" ] && LISTCERTS -edit -search ${SEARCH} || LISTCERTS -edit
+				exit 0
+									
+			elif [ "${certid}" != "" ] && [ "${CERTLIST[${certid}]}" != "" ]; then
+				cert=${CERTLIST[${certid}]}
+				certdir=${NM_CERTPATH}/live/${cert}
+				SUBJECT=$(${NCMD} openssl x509 -in ${certdir}/cert.pem -noout -subject|grep -oP '(?<=CN = )[^,]+'|sort -uV)
+				SUBJECTNAMES=$(${NCMD} openssl x509 -in ${certdir}/cert.pem -noout -text|grep -oP '(?<=DNS:|IP Address:)[^,]+'|sort -uV)
+				CERTEXPIRE=$(date -d "$(: | ${NCMD} openssl x509 -in ${certdir}/cert.pem -text | grep 'Not After' |awk '{print $4,$5,$7}')" '+%s');
+
+				SUBJECTNAMES=${SUBJECTNAMES//$'\n'/, }
+				# SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/\n/, /g")
+				SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/${SUBJECT}, //g")
+				SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/, ${SUBJECT}//g")
+				SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/${SUBJECT}//g")
+				SUBJECTNAMES=${SUBJECTNAMES//, /,}
+				oldSUBJECTNAMES=${SUBJECTNAMES}
+				[ "${CHECKCERT_DOMAINS[${SUBJECT}]}" != "" ] && monitored="Yes" || monitored='-'
+				editc=0
+				until [ "${editc^}" = "C" ]; do
+					echo -e "\033[K ${idsCL[White]}   Expires:                   ${idsCL[Cyan]}$(date -d @${CERTEXPIRE} '+%B %d, %Y')"
+					echo -e "\033[K ${idsCL[White]}   Cert Common Name:          ${idsCL[Cyan]}${SUBJECT}${idsST[Reset]}"
+					echo
+					echo -e "\033[K ${idsCL[Green]}1) ${idsCL[White]}Cert Alternate Names:      ${idsCL[Cyan]}${SUBJECTNAMES//,/, }"
+					echo -e "\033[K ${idsCL[Green]}2) ${idsCL[White]}Monitored:                 ${idsCL[Cyan]}${monitored}"
+					if [ "${editc}" != "s" ]; then
+						echo -e "\033[K"
+						echo -e "\033[K"
+						echo -e "\033[K"
+						echo -e "\033[K (${idsCL[Green]}S${idsCL[Default]})ave, (${idsCL[Red]}D${idsCL[Default]})elete, (${idsCL[Yellow]}C${idsCL[Default]})ancel, (${idsCL[Yellow]}E${idsCL[Default]})xit"
+						echo -e "\033[K"
+						echo -e "\033[K"
+						echo -e "\033[7A"
+						
+						[ "${con}" != "" ] && echo -en "\n"
+						echo -en "\033[K\n\033[K\r${idsCL[Green]}Enter the item number to edit: ${idsCL[Default]}"
+						read -n 1 editc
+						
+					    case "${editc}" in
+							1)  echo -e "\033[K\n\033[K"
+								echo -en "\033[KEnter new Alternate Names (comma-delimited): "
+								read  -i "${SUBJECTNAMES}" -e SUBJECTNAMES
+								SUBJECTNAMES=${SUBJECTNAMES//, /,}
+								echo -e "\033[6A"; for (( c=1; c<=6; c++ )); do echo -e "\033[K"; done; echo -e "\033[6A"
+								;;
+					        2) [ "${monitored}" == "-" ] && monitored='Yes' || monitored='-';;
+							[Dd])
+								echo -e "\033[K\n\033[K"
+								echo -en "\033[K${idsCL[LightCyan]}Are you sure you wish to delete the cert (y/N): ${idsCL[Default]}"
+								read -n 1 delconfirm
+							    case "${delconfirm}" in
+							        [Yy])
+										echo -en "\n\n${idsCL[LightCyan]}Removing certificate ... "
+										DEL-SSL ${cert} >/dev/null 2>&1
+										echo -e "${idsCL[LightGreen]}Done\n${idsCL[Default]}"
+										[ "${SEARCH}" != "0" ] && LISTCERTS -edit -search ${SEARCH} || LISTCERTS -edit
+										exit 0
+										;;
+									*)
+										[ "${delconfirm}" !="" ] && echo
+										echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A"
+										;;
+								esac							
+								;;
+							[Ee])
+								echo -e "\033[K"
+								exit 0
+								;;
+							[Cc]) 
+								echo -e "\r\033[K\n\r\033[K\n\r\033[K"
+								echo -e "\033[7A"; for (( c=1; c<=7; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[7A"
+								;;
+								*) ;;
+						esac
+						[ "${editc}" == "" ] && echo -e "\033[8A" || echo -e "\033[7A"
+						
+					else
+						for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[6A"
+						echo
+						echo -en "\033[K${idsCL[LightCyan]}Confirm changes (Y/n): ${idsCL[Default]}"
+						read -n 1 confirm
+					    case "${confirm}" in
+					        [Nn])
+								editc=C
+								echo -e "\r\033[K\n\r\033[K\n\r\033[K"
+								echo -e "\033[12A"; for (( c=1; c<=12; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[13A"
+								;;
+					        *)
+								[ "${confirm}" != "" ] && echo -en "\n"
+								echo -en "\033[1A\033[K\r${idsCL[LightCyan]}Configuring changes ... ${idsCL[Default]}"
+								
+								[ "${SUBJECTNAMES}" != "${oldSUBJECTNAMES}" ] && NEWCERT -expand -newsite ${SUBJECT},${SUBJECTNAMES} >/dev/null 2&>1
+								
+								if [ "${monitored^^}" == "YES" ]; then
+									if [ "$(grep ${SUBJECT} ${NM_FOLDER}/conf/ssl-domain-checks.conf)" == "" ]; then
+										[ ! -f ${NM_FOLDER}/conf/ssl-domain-checks.conf ] && touch ${NM_FOLDER}/conf/ssl-domain-checks.conf
+										echo "${SUBJECT} 443" >> ${NM_FOLDER}/conf/ssl-domain-checks.conf
+										checkcerts_sorted=$(sort <<< "$(cat ${NM_FOLDER}/conf/ssl-domain-checks.conf)")
+										rm -f ${NM_FOLDER}/conf/ssl-domain-checks.conf >/dev/null 2&>1
+										echo "${checkcerts_sorted}" > ${NM_FOLDER}/conf/ssl-domain-checks.conf
+										[ ${IS_NODEMANAGER} -eq 0 ] && scp -q ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${NM_NODEMANAGER}:${NM_FOLDER}/conf/ssl-domain-checks.conf
+
+									fi
+								else
+									sed -i "/${SUBJECT}/d" ${NM_FOLDER}/conf/ssl-domain-checks.conf >/dev/null 2&>1
+									[ ${IS_NODEMANAGER} -eq 0 ] && scp -q ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${NM_NODEMANAGER}:${NM_FOLDER}/conf/ssl-domain-checks.conf
+								fi								
+								echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
+								echo
+								echo -en "\033[K\r${idsCL[LightCyan]}Continue or Exit (C/e): ${idsCL[Default]}"
+								read -n1 con
+							    case "${con}" in
+							        [Ee])
+										# echo -e "\n\033[K\n\033[K"
+										exit 0
+										;;
+									*)
+										editc=C
+										echo -e "\r\033[K\n\r\033[K\n\r\033[K"
+										echo -e "\033[13A"; for (( c=1; c<=13; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[15A"
+										[ "${SEARCH}" != "0" ] && LISTCERTS -edit -search ${SEARCH} || LISTCERTS -edit
+										exit 0
+										;;
+								esac
+								;;
+					    esac
+					fi
+					
+				done
+				
+			else #no cert
+				echo -e "\033[3A"; for (( c=1; c<=3; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[4A"
+			fi
+			
+		done
+		
+	fi
+	
+	
 	echo 
-	if [ -z $action ] || [ "${action}" = "gui" ]; then
+	if [ -z ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then
 		DIVIDER true
 		ENTER2CONTINUE
 	fi
-	echo ""
+	echo 
 }
 
 LISTCERTS_NPM(){
 	declare -i cw; declare -i spc1; declare -i c
 	declare -A CHECKCERT_DOMAINS
 	IFS=$'\n'
-	for LINE in `egrep -v '(^#|^$)' ${FOLDER}/ssl-cert-check/ssldomains`; do
+	for LINE in `egrep -v '(^#|^$)' ${NM_FOLDER}/conf/ssl-domain-checks.conf`; do
 	    HOST=${LINE%% *}
 	    PORT=${LINE#* }
 	    IFS=" "
@@ -278,15 +491,15 @@ LISTCERTS_NPM(){
 	done
 	unset IFS
 	if [ ! -z ${LOCAL_SERVICES+x} ]; then
-		NCMD="ssh root@${MYSQL_HOSTS[0]}"
+		NCMD="${SSHCMD} root@${MYSQL_HOSTS[0]}"
 		${NCMD} rm -f /tmp/ssllist
-		${NCMD} 'for certdir in /opt/nginx-proxy/letsencrypt/live/*/ ; do echo $certdir; done' > /tmp/ssllist
+		${NCMD} 'for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done' > /tmp/ssllist
 	else
 		NCMD=''
 		rm -f /tmp/ssllist
-		for certdir in /opt/nginx-proxy/letsencrypt/live/*/ ; do echo $certdir; done > /tmp/ssllist
+		for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done > /tmp/ssllist
 	fi
-	if [ -z $action ] || [ "${action}" = "gui" ]; then
+	if [ -z ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then
 		DIVIDER true
 	fi
 	echo 
@@ -334,14 +547,14 @@ LISTCERTS_NPM(){
 		DIVIDER false darkGray 120
 	done
 	echo 
-	if [ -z $action ] || [ "${action}" = "gui" ]; then
+	if [ -z ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then
 		DIVIDER true
 		ENTER2CONTINUE
 	fi
-	echo ""
+	echo 
 }
 COPYCERTS_NPM(){
-	ssldir='/opt/nginx-proxy/ssl'
+	ssldir='${NM_CERTPATH}/ssl'
 	
 	if [ "${1}" = "reset" ]; then
 		echo "Resetting ... Deleting all SSL symlink folders"
@@ -357,11 +570,11 @@ COPYCERTS_NPM(){
 		done
 	fi
 	
-	if [ -z $action ] || [ "${action}" = "gui" ]; then
+	if [ -z ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then
 		DIVIDER true
 	fi
 	
-	ssls=$(find /opt/nginx-proxy/letsencrypt/live/* -type d)
+	ssls=$(find ${NM_CERTPATH}/live/* -type d)
 	for certdir in ${ssls[@]}; do
 		SUBJECT=$(openssl x509 -in ${certdir}/cert.pem -noout -subject|grep -oP '(?<=CN = )[^,]+'|sort -uV)
 		if [ ! -L ${ssldir}/${SUBJECT} ]; then
@@ -370,7 +583,7 @@ COPYCERTS_NPM(){
 		fi
 	done
 	
-	if [ -z $action ] || [ "${action}" = "gui" ]; then
+	if [ -z ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then
 		echo
 		DIVIDER true
 		ENTER2CONTINUE
@@ -379,7 +592,7 @@ COPYCERTS_NPM(){
 }
 
 CHECK_NPMCERTS(){
-	ssls=$(find /opt/nginx-proxy/letsencrypt/live/* -type d)
+	ssls=$(find ${NM_CERTPATH}/live/* -type d)
 	
 	for certdir in ${ssls[@]}; do
 		SUBJECT=$(openssl x509 -in ${certdir}/cert.pem -noout -subject|grep -oP '(?<=CN = )[^,]+'|sort -uV)
@@ -403,28 +616,30 @@ CHECK_NPMCERTS(){
 
 CHECK-CERTS(){
 	if [ "${1}" == "check" ]; then
-		rm -f ${FOLDER}/ssl-cert-check.lastrun
-		${FOLDER}/ssl-cert-check/ssl-cert-check -f ${FOLDER}/ssl-cert-check/ssldomains > ${FOLDER}/ssl-cert-check.lastrun
-		SSLLOG="$(cat ${FOLDER}/ssl-cert-check.lastrun)"
+		rm -f ${NM_LOGFOLDER}/ssl-cert-check.lastrun
+		${NM_FOLDER}/ssl-cert-check/ssl-cert-check -f ${NM_FOLDER}/conf/ssl-domain-checks.conf > ${NM_LOGFOLDER}/ssl-cert-check.lastrun
+		SSLLOG="$(cat ${NM_LOGFOLDER}/ssl-cert-check.lastrun)"
 		SENDNOTICE "SSL Certs Check" "SSL Certs Check\n$SSLLOG"
 	else
-		# ${FOLDER}/ssl-cert-check/ssl-cert-check -f ${FOLDER}/ssl-cert-check/ssldomains
 	    IFS=$'\n'
-	    for LINE in `egrep -v '(^#|^$)' ${FOLDER}/ssl-cert-check/ssldomains`;  do
+	    for LINE in `egrep -v '(^#|^$)' ${NM_FOLDER}/conf/ssl-domain-checks.conf`;  do
 	        HOST=${LINE%% *}
 	        PORT=${LINE#* }
-			CERTINFO=$(${FOLDER}/ssl-cert-check/ssl-cert-check -p ${PORT} -s ${HOST} -N)
-			CERTVALID=$(echo ${CERTINFO} | awk -F' valid' '{print $1}')
+			CERTINFO=$(${NM_FOLDER}/ssl-cert-check/ssl-cert-check -p ${PORT} -s ${HOST} -N)
+			CERTVALID=$(echo "${CERTINFO}" | grep valid | awk -F' valid' '{print $1}')
 			CERTVALID=${CERTVALID: -1}
 			CERTDAYS=${CERTINFO#*days=}
-			if [ "${CERTVALID}" == "0" ] || [ "${CERTVALID}" == "E" ]; then
-				printf "%-30s: %s\n" "${HOST}" "SSL is not valid"
-				SENDNOTICE "SSL Not Valid" "The (${HOST}) SSL is not valid" 1
-				
+			if [ "${CERTVALID}" == "0" ] || [ "${CERTVALID}" == "E" ] || [ "$(echo ${CERTINFO} | grep unreadable)" != "" ]; then
+				if [ "$(CHECK_HOST ${HOST})" != "false" ]; then
+					printf "%-30s: %s\n" "${HOST}" "SSL is not valid"
+					SENDNOTICE "SSL Not Valid" "The (${HOST}) SSL is not valid" 1
+				else
+					printf "%-30s: %s\n" "${HOST}" "Host is Offline"
+				fi
 			elif [ ${CERTDAYS} -lt 1 ]; then
 				printf "%-30s: %s\n" "${HOST}" "SSL Expired! (${CERTDAYS} days)"
 				SENDNOTICE "SSL Expired" "The (${HOST}) SSL is expired!! (${CERTDAYS} days)" 2
-				
+
 			elif [ ${CERTDAYS} -lt 15 ]; then
 				printf "%-30s: %s\n" "${HOST}" "SSL is expiring in $CERTDAYS days!"
 				SENDNOTICE "SSL Expiring" "The (${HOST}) SSL is expiring in ${CERTDAYS} days" 1
@@ -435,4 +650,66 @@ CHECK-CERTS(){
 	    done
 		unset IFS
 	fi
-}
+}
+
+VCENTER-SSL(){
+	if [ "${NM_VC_HOSTNAME}" != "" ] && [ "${NM_VC_USER}" != "" ] && [ "${NM_VC_PASS}" != "" ] && [ "${NM_PDNS_APIKEY}" != "" ]; then
+		pwsh ${NM_FOLDER}/inc/vCenter-SSL.ps1
+		echo
+	fi
+}
+
+COPYCERTS(){
+	if [ -f ${NM_FOLDER}/conf/copycerts.sh.inc ] && [ "${NM_COPYCERTS_HOST}" ] && [ "${NM_COPYCERTS_PATH}" ]; then
+		source ${NM_FOLDER}/conf/copycerts.sh.inc
+		
+		if [ "${COPYCERT}" ] && [ "${CERTFOLDER}" ]; then
+			
+			arr COPYCERTS
+			arr CERTFOLDERS
+			IFS=,; var=(${COPYCERT}); unset IFS
+			for value in "${var[@]}"; do arr_insert COPYCERTS ${value}; done
+			IFS=,; var=(${CERTFOLDER}); unset IFS
+			for value in "${var[@]}"; do arr_insert CERTFOLDERS ${value}; done
+	
+			i=0; RUN_POST_COMMANDS=false
+			for CERTSITE in "${COPYCERTS[@]}"; do
+				c=0; spc=''; until [ $c = $(expr 35 - ${#CERTSITE}) ]; do spc="${spc} "; c=$(expr ${c} + 1); done
+				echo -en "${idsCL[LightCyan]}Updating ${idsCL[Green]}${CERTSITE}${spc}${idsCL[LightCyan]}: "
+				COPYTO=${CERTFOLDERS[${i}]}
+				[ ! -d ${COPYTO} ] && mkdir -p ${COPYTO}
+				scp le@${NM_COPYCERTS_HOST}:${NM_COPYCERTS_PATH}/${CERTSITE}/privkey.pem ${COPYTO}/privkey.pem >/dev/null 2>&1
+				if ! /usr/bin/md5sum -c ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1 || [ "${1^^}" == "FORCE" ]; then
+					scp le@${NM_COPYCERTS_HOST}:${NM_COPYCERTS_PATH}/${CERTSITE}/* ${COPYTO}/ >/dev/null 2>&1
+					rm -f ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1
+					[ -f ${COPYTO}/privkey.pem ] && md5sum ${COPYTO}/privkey.pem > ${COPYTO}/privkey.pem.md5
+					RUN_POST_COMMANDS=true
+					touch ${NM_LOGFOLDER}/copycerts.lastrun
+					echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
+				else
+					echo -e "${idsCL[LightCyan]}No update needed${idsCL[Default]}"
+				fi
+				((i++))
+			done
+			echo
+			if [ ${RUN_POST_COMMANDS} = true ]; then
+				echo -e "${idsCL[LightCyan]}Running post commands ...${idsCL[Default]}"
+				COPYCERTS_POST_COMMANDS
+			else
+				echo
+			fi
+						
+		else
+			echo -e "${idsCL[Red]}Config file not complete, missing at least \${COPYCERT} and/or \${CERTFOLDER} variables${idsCL[Default]}\n"
+			
+		fi
+	else
+		echo -e "${idsCL[Red]}No ${NM_FOLDER}/conf/copycerts.sh.inc config file found, or missing \${NM_COPYCERTS_HOST} and/or \${NM_COPYCERTS_PATH} variables${idsCL[Default]}\n"
+	fi
+}
+
+
+
+
+
+

inc/services.inc

@@ -0,0 +1,518 @@
+#!/usr/bin/env bash
+
+SINGLE_SERVER_SERVICE_CHECK(){
+	if [ -f ${NM_TMPFOLDER}/.singleserver.${1^^}.check ]; then
+		([ "${2^^}" == "START" ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.singleserver.${1^^}.check)) -ge 1200 ]) && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.check
+	fi
+	if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.check ]; then
+		touch ${NM_TMPFOLDER}/.singleserver.${1^^}.check
+	
+		servicestocheck=${1^^}_SINGLESRVR_SERVICES[@]
+		dockerstocheck=${1^^}_SINGLESRVR_DOCKERS[@]
+		hosts=${1^^}_HOSTS[@]
+	
+		[ "${2^^}" == "START" ] && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
+
+		
+		# rm -f ${NM_TMPFOLDER}/.singleserver*
+			
+		if [ ! -f ${NM_TMPFOLDER}/.skip ] && ([[ "$(declare -p ${1^^}_SINGLESRVR_SERVICES)" =~ "declare -a" ]] || [[ "$(declare -p ${1^^}_SINGLESRVR_DOCKERS)" =~ "declare -a" ]] || [ "${1^^}" == "LPD" ] || [ "${1^^}" == "DNS" ] || [ "${1^^}" == "LDNS" ]); then	
+			if [ "${1^^}" == "LPD" ] || [ "${1^^}" == "DNS" ] || [ "${1^^}" == "LDNS" ]; then
+				dnstest=$(dig +short +tries=3 +time=3 www.google.com @127.0.0.1)
+				if [ "${dnstest}" == "" ] || [[ "${dnstest}" == *";;"* ]]; then
+					SKIP_SERVER_CHECKS on >/dev/null 2>&1
+					completed=false; scanstart=$(date +%s)
+					sleep 4s
+					until [ "${completed}" == "true" ]; do
+						dnstest=$(dig +short +tries=3 +time=3 www.google.com @127.0.0.1)
+						if [ "${dnstest}" != "" ] && [[ "${dnstest}" != *";;"* ]]; then
+							completed=true
+							break
+							
+						elif [ $(($(date +%s)-scanstart)) -ge 180 ]; then
+							SENDNOTICE "${NM_HOSTNAMES[${RUN_NODE_IP}]} DNS Startup Failure 1" "${NM_HOSTNAMES[${RUN_NODE_IP}]} (${RUN_NODE_IP})
+Server did not start serving DNS requests within 3mins, starting Pi-Hole repair...." 1
+							/usr/local/bin/pihole -r
+						
+						elif [ $(($(date +%s)-scanstart)) -ge 600 ]; then
+							SENDNOTICE "${NM_HOSTNAMES[${RUN_NODE_IP}]} DNS Startup Failure 2" "${NM_HOSTNAMES[${RUN_NODE_IP}]} (${RUN_NODE_IP})
+Server did not start serving DNS requests within 10mins you moron...." 1
+							killall bash
+							exit 1
+						fi
+						sleep 15s
+					done
+					/usr/bin/docker restart powerdns_admin >/dev/null 2>&1
+					SKIP_SERVER_CHECKS off >/dev/null 2>&1
+				fi
+				
+			elif [[ $(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) == *${NM_SINGLESRVR_IP[${1^^}]}* ]]; then
+				# if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.singleserver.${1^^}.primary)) -ge 300 ]; then
+				# 	if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ]; then
+						if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ]; then
+							touch ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
+							SENDNOTICE "'${NM_NODETYPES[${1^^}]}' Node Switch" "Starting SingleServer for '${NM_NODETYPES[${1^^}]}' on ${NM_HOSTNAMES[${RUN_NODE_IP}]} (${RUN_NODE_IP}), stopping on other Nodes"
+						fi
+						echo "$(date +%Y-%m-%d-%H-%M-%S) - ${NM_HOSTNAMES[${RUN_NODE_IP}]} - Starting SingleServer for '${NM_NODETYPES[${1^^}]}' on ${NM_HOSTNAMES[${RUN_NODE_IP}]} (${RUN_NODE_IP}), stopping on the other Nodes ..." >> ${NM_LOGFILE}
+						for stc in "${!servicestocheck}"; do
+							[ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.service pdnsadmin.socket"
+							for nip in "${!hosts}"; do
+								if [[ "${RUN_NODE_IP}" != *"${nip}"* ]] && [ "$(CHECK_HOST ${nip})" != "false" ]; then
+									${SSHCMD} root@${nip} 'systemctl is-active --quiet '${stc}' && /bin/systemctl stop '${stc} >/dev/null 2>&1
+									${SSHCMD} root@${nip} '[ -f '${NM_TMPFOLDER}'/.singleserver.'${1^^}'.primary ] && rm -f '${NM_TMPFOLDER}'/.singleserver.'${1^^}'.primary' >/dev/null 2>&1
+								fi
+							done
+						done
+						
+						#### HERE
+						
+						for docker in "${!dockerstocheck}"; do
+							for nip in "${!hosts}"; do
+								if [[ "${RUN_NODE_IP}" != *"${nip}"* ]] && [ "$(CHECK_HOST ${nip})" != "false" ]; then
+									${SSHCMD} root@${nip} '[ "$(docker ps -a -q -f name='${docker}')" ] && docker stop '${docker} >/dev/null 2>&1
+									[ "${docker}" == "authelia" ] && ${SSHCMD} root@${nip} '[ "$(docker ps -a -q -f name=auth_redis)" ] && docker stop auth_redis' >/dev/null 2>&1
+								fi
+							done
+						done
+						sleep 20s
+					# else
+						touch ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
+					# fi
+				
+					for stc in "${!servicestocheck}"; do
+						if ! systemctl is-active --quiet ${stc}; then
+							[ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.service pdnsadmin.socket"
+							/bin/systemctl start ${stc} >/dev/null 2>&1
+						fi
+					done
+					for docker in "${!dockerstocheck}"; do
+						if [ ! "$(docker ps -a -q -f name=${docker})" ]; then
+							[ "${docker}" == "authelia" ] && docker start auth_redis && sleep 2s >/dev/null 2>&1
+							docker start ${docker} >/dev/null 2>&1
+						fi
+					done
+					[ -f ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary ] && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary
+					echo "$(date +%Y-%m-%d-%H-%M-%S) - ${NM_HOSTNAMES[${RUN_NODE_IP}]} - ... Done" >> ${NM_LOGFILE}
+				# fi
+				
+
+			else
+				# if [ -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] || [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary)) -ge 300 ]; then
+					[ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary ] && touch ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary
+					for stc in "${!servicestocheck}"; do
+						if [ $(systemctl is-active --quiet ${stc}) ]; then
+							[ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.socket pdnsadmin.service"
+							/bin/systemctl stop ${stc} & >/dev/null 2>&1
+						fi
+					done
+					for docker in "${!dockerstocheck}"; do
+						[ "$(docker ps -a -q -f name=${docker})" ] && docker stop ${docker} & >/dev/null 2>&1
+					done
+					[ -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
+				# fi
+			fi
+	
+			[ "${1^^}" == "WEB" ] && [ "$(systemctl is-active nginx)" != "active" ] && ${NM_SCRIPT} service web restart ${RUN_NODE_IP}
+		
+		elif [ "${2^^}" == "START" ] && [ -f ${NM_TMPFOLDER}/.skip ]; then
+			systemctl stop keepalived >/dev/null 2>&1
+		fi
+		
+		
+		rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.check
+	fi
+}
+
+SERVICE_MGMT(){
+	declare -A SERVICE
+	QUIET=0
+	while [ $# -gt 0 ]; do
+	    case "${1}" in
+	        -s|-service) SERVICE['service']=${2,,};;
+	        -n|-node) SERVICE['node']=${2^^};;
+	        -nt|-nodetype) SERVICE['nodetype']=${2^^};;
+	        -a|-action) SERVICE['action']=${2,,};;
+	        -q|-quiet) QUIET=1;;
+			-h|-help) 
+				echo -e "\nUsage: ${idsCL[Yellow]}[nodemgmt or nmg] ${idsCL[LightYellow]}service${idsCL[Default]} {"
+				width=35
+				printf "%-${width}s- %s\n" "    -s|-service {service}" "Name of service to manage"
+				printf "%-${width}s- %s\n" "    -n|-node {node-lan-ip}" "Node to run on"
+				printf "%-${width}s- %s\n" "    -nt|-nodetype {nodetype}" "NodeType to run on, or all. Defaults to local nodetype"
+				printf "%-${width}s- %s\n" "    -a|-action {action}" "Action to perform; start, stop, restart etc"
+				printf "%-${width}s- %s\n" "    -q|-quiet" "Do not output, typically used from cron jobs"
+				echo -e "}\n"
+				exit 0
+				;;
+			*)
+				if [ "${NM_SERVICE_DESC[${1}]}" != "" ]; then
+					SERVICE['service']=${1}
+					
+				elif [ "${NM_SRVCOPTS[${1}]}" != "" ]; then
+					SERVICE['action']=${1}
+					
+				elif [ "${NM_HOSTNAMES[${1}]}" != "" ]; then
+					SERVICE['node']=${1}
+					
+				elif [ "${1}" == "q" ]; then
+					QUIET=1
+					
+				fi
+				;;
+	    esac
+		shift
+	done
+	# echo "SERVICE=${SERVICE['service']}"
+	# echo "SERVICE DESC=${NM_SERVICE_DESC[${SERVICE['service']}]}"
+	# echo "ACTION=${SERVICE['action']}"
+	# echo "NODE=${SERVICE['node']}"
+	# echo "NODETYPE=${SERVICE['nodetype']}"
+	# echo "QUIET=${QUIET}"
+	
+	if [ ! "${NM_SERVICE_DESC[${SERVICE['service']}]}" ] && [ "${NM_SERVICE_DESC[${SERVICE['service']}]}" != "ALL" ]; then
+		echo -e "${idsCL[Red]}"${SERVICE['service']}" is an unknown Service.${idsCL[Default]}"
+		exit 1	
+	fi
+	# [ "${SERVICE['nodetype']}" == "" ] && SERVICE['nodetype']=
+	
+	if [ "${SERVICE['nodetype']}" == "ALL" ]; then
+		# NT_HOSTS=ALL_HOSTS[@]
+		NT_HOST=RNIP
+		NTS=(${NM_NODE_TYPES[*]})
+		
+	elif [ "${SERVICE['nodetype']}" != "" ]; then
+		if [ "${NM_HOSTS[${SERVICE['nodetype']}]}" != "" ]; then
+			NT_HOSTS=${SERVICE['nodetype']}_HOSTS[@]
+			NT_HOST=${SERVICE['nodetype']}_HOSTS[0]
+			NTS=("${SERVICE['nodetype']}");
+		else
+			echo -e "${idsCL[Red]}"${SERVICE['nodetype']}" is an unknown NodeType.${idsCL[Default]}"
+			exit 1	
+		fi
+		
+	elif [ "${RUN_NODE_TYPE}" != "" ]; then
+			NT_HOSTS=${RUN_NODE_TYPE}_HOSTS[@]
+			NT_HOST=${RUN_NODE_TYPE}_HOSTS[0]
+			NTS=("${RUN_NODE_TYPE}");
+
+	# else
+	# 	NTS=(${NM_NODE_TYPES[*]})
+	fi
+	
+	#var=NC_HOSTS[@]
+	
+	if [ "${SERVICE['service']}" = "glusterd" ]; then
+		
+		for nip in "${GL_HOSTS[@]}"; do
+			if [[ "${RUN_NODE_IP}" == *"${nip}"* ]]; then
+				nip='localhost '
+				NCMD=''
+			else
+				NCMD="${SSHCMD} root@${nip}"
+			fi
+
+			[ ${QUIET} -eq 0 ] && echo -en "${NM_SRVCOPTS[${SERVICE['action']}]}ing on '$nip'... ${idsCL[Default]}"
+			checkhost=$(CHECK_HOST ${nip})
+			if [ "${checkhost}" != "false" ]; then
+				if [ ${QUIET} -eq 0 ]; then
+					if [[ "enable,disable" = *"${SERVICE['action']}"* ]] || [ "${SERVICE['service']}" = "daemon-reload" ]; then
+						echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+					elif [ "$(${NCMD} systemctl is-active ${SERVICE['service']} | tr -d $'\r')" = "active" ]; then
+						echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+					elif [ "${SERVICE['action']}" = "stop" ]; then
+						echo -e "${idsCL[Red]}STOPPED${idsCL[Default]}"
+					else
+						echo -e "${idsCL[Red]}ERROR${idsCL[Default]}"
+					fi
+				fi
+			elif [ ${QUIET} -eq 0 ]; then
+				echo -e "${idsCL[Red]}Node is Down${idsCL[Default]}"
+			fi
+
+		done
+		
+		if [ "${SERVICE['action']}" = "start" ] || [ "${SERVICE['action']}" = "restart" ]; then
+			
+			echo
+			sleep 5s
+			
+			for nip in "${GL_HOSTS[@]}"; do
+				if [[ "${RUN_NODE_IP}" == *"${nip}"* ]]; then
+					nip='localhost '
+					NCMD=''
+				else
+					NCMD="${SSHCMD} root@${nip}"
+				fi
+			
+				if [ ${QUIET} -eq 0 ]; then
+					echo -en "Mounting drive on '$nip'... ${idsCL[Default]}"
+				fi
+				checkhost=$(CHECK_HOST ${nip})
+				if [ "${checkhost}" != "false" ]; then
+					#${NCMD} mount -a > /dev/null 2>&1
+					if [ ${QUIET} -eq 0 ]; then
+						# if [[ "${NCHOSTS}" == *"${nip}"* ]]; then
+						if [[ " ${NC_HOSTS[*]} " =~ " ${nip} " ]]; then
+							mntpath="/mnt/Nextcloud-Data"
+						# elif [[ "${WEBHOSTS}" == *"${nip}"* ]]; then
+						elif [[ " ${NM_HOSTS['WEB'][*]} " =~ " ${nip} " ]]; then
+							mntpath="/mnt/web-data"
+						fi
+						${NCMD} "test -e ${mntpath}/mounted"
+						if [ $? -eq 0 ]; then
+							echo -e "${idsCL[Green]}MOUNTED ($mntpath)${idsCL[Default]}"
+						else
+							echo -e "${idsCL[Red]}NOT MOUNTED ($mntpath)${idsCL[Default]}"
+						fi
+					fi
+					
+					if [ "$nip" = "10.10.1.43" ]; then
+						echo -en "Mounting drive on '$nip'... ${idsCL[Default]}"
+						mntpath="/mnt/Nextcloud-Data"
+						${NCMD} "test -e ${mntpath}/mounted"
+						if [ $? -eq 0 ]; then
+							echo -e "${idsCL[Green]}MOUNTED ($mntpath)${idsCL[Default]}"
+						else
+							echo -e "${idsCL[Red]}NOT MOUNTED ($mntpath)${idsCL[Default]}"
+						fi
+					fi
+					
+				elif [ ${QUIET} -eq 0 ]; then
+					echo -e "${idsCL[Red]}Node is Down${idsCL[Default]}"
+				fi
+			
+			done
+			
+		fi
+		
+		
+	else
+
+		
+		# if [ "${RUN_NODE_TYPE}" == "" ]; then
+		#
+		# fi
+		if [ "${NM_SERVICE_DESC[${SERVICE['service']}]}" = "" ]; then
+			echo -e "${idsCL[Red]}(${SERVICE['service']}) is not an allowed service.${idsCL[Default]}"
+			exit 1	
+		fi
+		if [ "${NM_SRVCOPTS[${SERVICE['action']}]}" = "" ]; then
+			echo -e "${idsCL[Red]}(${SERVICE['action']}) is not an allowed service action.${idsCL[Default]}"
+			exit 1
+		fi
+		if [ ${QUIET} -eq 0 ]; then
+			if [ "${SERVICE['action']}" = "start" ] &&  [ "${SERVICE['service']}" = "haproxy" ]; then
+				TACT='restart'
+			else
+				TACT="${SERVICE['action']}"
+			fi
+
+			echo
+			echo -e "${idsCL[LightGreen]}[[ ${NM_SERVICE_DESC[${SERVICE['service']}]} ${NM_SRVCOPTS[${SERVICE['action']}]}ing ]]${idsCL[Default]}"
+			echo -e "${idsCL[LightGreen]}-------------------------------------------${idsCL[Default]}"
+		fi
+	
+		# echo "HERE: ${RUN_NODE_TYPE} - ${NT_HOST} = ${!NT_HOST}"
+		if ([ "${SERVICE['service']}" = "nginx" ] || [ "${SERVICE['service']}" = "apache2" ]) && ([ "${SERVICE['node']}" == "" ] || [ "${SERVICE['node']}" == "ALL" ]); then			
+			if [ "${RUN_NODE_TYPE}" != "" ] && [ "${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}" != "" ] && ([ "${SERVICE['action']}" = "restart" ] || [ "${SERVICE['action']}" = "reload" ]); then
+				if [ "${SERVICE['node']}" != "ns" ]; then
+					if [ ${QUIET} -eq 0 ]; then
+						echo -en "${idsCL[LightYellow]}Verifying replication across the nodes... ${idsCL[Default]}"
+					fi
+					if [[ "${RUN_NODE_IP}" == *"${!NT_HOST}"* ]]; then
+						PH_CMD=""
+					else
+						PH_CMD="${SSHCMD} root@${!NT_HOST}"
+					fi
+					${PH_CMD} touch ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/.test.repl
+					# ${PH_CMD} "echo -e \"Service ${SERVICE['service']} ${SERVICE['action']}\" >> ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/.test.repl"
+					for nip in "${!NT_HOSTS}"; do
+						checkhost=$(CHECK_HOST ${nip})
+						if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then
+							checked=false
+							until [ "${checked}" = "true" ]; do
+								checked="`${PH_CMD} ${SSHCMD} root@${nip} [ -f ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/.test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/.test.repl)) -le 90 ] && echo true || echo false`"
+							done
+						fi
+					done
+					
+					for nip in "${!NT_HOSTS}"; do
+						checkhost=$(CHECK_HOST ${nip})
+						if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then
+							unset checked1 checked2
+							until [ "${checked1}" = "true" ]; do
+								until [ "${checked2}" = "true" ]; do checked2="`${PH_CMD} [ -f ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/.test.repl ] && echo true`"; sleep 1s; done
+								checked1="`${PH_CMD} [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/.test.repl)) -le 90 ] && echo true`"
+							done
+						fi
+					done					
+					${PH_CMD} rm -f ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/.test.repl
+				fi
+			fi
+		elif ([ "${SERVICE['service']}" = "pdns" ] || [ "${SERVICE['service']}" = "pdnsadmin" ] || [ "${SERVICE['service']}" = "headscale" ]) && ([ "${SERVICE['node']}" == "" ] || [ "${SERVICE['node']}" == "ALL" ]); then			
+			if [ "${SERVICE['action']}" = "start" ] || [ "${SERVICE['action']}" = "restart" ] || [ "${SERVICE['action']}" = "reload" ]; then
+				if [ "${SERVICE['node']}" != "ns" ]; then
+					[ ${QUIET} -eq 0 ] && echo -en "${idsCL[LightYellow]}Verifying replication across the nodes... ${idsCL[Default]}"
+					if [[ "${RUN_NODE_IP}" == *"${!NT_HOST}"* ]]; then
+						PH_CMD=""
+					else
+						PH_CMD="${SSHCMD} root@${!NT_HOST}"
+					fi
+					${PH_CMD} touch ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/.test.repl
+					for nip in "${!NT_HOSTS}"; do
+						checkhost=$(CHECK_HOST ${nip})
+						if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then
+							unset checked1 checked2
+							until [ "${checked1}" = "true" ]; do
+								until [ "${checked2}" = "true" ]; do checked2="`${PH_CMD} [ -f ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/.test.repl ] && echo true`"; sleep 1s; done
+								checked1="`${PH_CMD} [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/.test.repl)) -le 90 ] && echo true`"
+							done
+						fi
+					done
+					${PH_CMD} rm -f ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/.test.repl
+				fi
+			fi
+		fi
+		if [ ${QUIET} -eq 0 ]; then
+			echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
+			echo
+		fi
+		
+		if [[ "$(declare -p NTS)" =~ "declare -a" ]]; then
+			for NTYPE in "${NTS[@]}"; do
+				var1=${NTYPE}_SERVICES_CHECK[@]
+				# if [[ "${!var1}" = *"${SERVICE['service']}"* ]]; then
+				if [[ " ${!var1} " =~ " ${SERVICE['service']} " ]]; then
+					if [ "${SERVICE['node']}" != "" ]; then
+						var2=(${SERVICE['node']})
+						sethost=true;
+					else
+						var2=${NTYPE}_HOSTS[@]
+						IFS=' '
+						var2=(${!var2})
+						unset IFS
+						sethost=false
+					fi
+				
+					for nip in "${var2[@]}"; do
+						# if [[ "${RUN_NODE_IP}" == *"${SERVICE['node']}"* ]]; then GO=true;
+						# elif [ ! -z ${SERVICE['node']+x} ] || [ "${SERVICE['node']}" == "q" ]; then GO=true;
+						# else GO=false;
+						# fi
+						# if [ "${GO}" == "true" ]; then
+						if [ $sethost == true ]; then
+							nodename=${NM_HOSTNAMES[${SERVICE['node']}]}
+						else
+							nodename="${NM_HOSTNAMES[${nip}]}[${nip}]"
+						fi
+							if [[ "${RUN_NODE_IP}" == *"${nip}"* ]]; then
+								nip='localhost '
+								NCMD=''
+							else
+								NCMD="${SSHCMD} root@${nip}"
+							fi
+					
+							NOGOCHK=true;
+							if [ "${SERVICE['service']}" == "gitea" ]; then
+								if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *$(GET_AUTHELIA_IP)* ]]; then
+									NOGOCHK=false;
+								fi
+							elif [ "${SERVICE['service']}" == "headscale" ]; then
+								if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['HS']}* ]]; then
+									NOGOCHK=false;
+								fi
+							fi
+					
+							if [ "${NOGOCHK}" == "true" ]; then
+								if [ ${QUIET} -eq 0 ]; then
+									echo -en "${NM_SRVCOPTS[${SERVICE['action']}]}ing on ${nodename} ($nip)... ${idsCL[Default]}"
+								fi
+								checkhost=$(CHECK_HOST ${nip})
+								if [ "${checkhost}" != "false" ]; then
+								
+									if [ "${SERVICE['service']}"= = "offsite-power-check" ]; then
+										if [ ${QUIET} -eq 0 ] && [ "${SERVICE['action']}" != "status" ]; then
+											if [ "$(${SSHCMD} root@${nip} ps -U root | grep "offsite-power-check.sh start" | grep -v "grep" | awk '{print $1}')" != "" ]; then
+												echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+											else
+												echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
+											fi
+										fi
+									else
+										if [ "${SERVICE['service']}" = "pdnsadmin" ]; then
+											srva="pdnsadmin.socket pdnsadmin.service"
+										elif [ "${SERVICE['service']}" = "syncthing" ] && [[ "${NM_SERVICES_CHECK[${NTYPE}]}" = *"syncthing@pdns"* ]]; then
+											srva="syncthing syncthing@pdns"
+										else
+											srva=${SERVICE['service']}
+										fi
+										if [ "${SERVICE['action']}" != "status" ]; then
+											${NCMD} systemctl ${SERVICE['action']} ${srva} >/dev/null 2>&1
+										else
+											echo
+											${NCMD} systemctl ${SERVICE['action']} ${srva}
+											echo
+										fi
+										if [ ${QUIET} -eq 0 ] && [ "${SERVICE['action']}" != "status" ]; then
+											SStatus=$(${NCMD} systemctl is-active ${SERVICE['service']} | tr -d $'\r')
+											if [[ "enable,disable" = *"${SERVICE['action']}"* ]] || [ "${SERVICE['service']}" = "daemon-reload" ]; then
+												echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+											elif [[ "${srva}" = *".socket"* ]] && [ "${SStatus}" = "active" ]; then
+												echo -e "${idsCL[Green]}Done (& socket service)${idsCL[Default]}"
+											elif [[ "${srva}" = *"@pdns"* ]] && [ "${SStatus}" = "active" ]; then
+												echo -e "${idsCL[Green]}Done (& @pdns)${idsCL[Default]}"
+											elif [ "${SStatus}" = "active" ]; then
+												echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+											elif [ "${SERVICE['action']}" = "stop" ]; then
+												echo -e "${idsCL[Red]}STOPPED${idsCL[Default]}"
+											else
+												echo -e "${idsCL[Red]}ERROR${idsCL[Default]}"
+											fi
+										fi
+									fi
+								
+								elif [ ${QUIET} -eq 0 ]; then
+									echo -e "${idsCL[Red]}Node is Down${idsCL[Default]}"
+								fi
+							fi
+						# fi
+						# if [ "${SERVICE['service']}" = "gitea" ]; then
+						# 	break
+						# fi
+					done
+				fi
+			done
+			
+		else #no-nodetypes, standalone setup
+			echo -en "${NM_SRVCOPTS[${SERVICE['action']}]}ing on localhost ... ${idsCL[Default]}"
+			if [ "${SERVICE['action']}" != "status" ]; then
+				systemctl ${SERVICE['action']} ${srva} >/dev/null 2>&1
+			else
+				echo
+				systemctl ${SERVICE['action']} ${srva}
+				echo
+			fi
+			if [ ${QUIET} -eq 0 ] && [ "${SERVICE['action']}" != "status" ]; then
+				if [[ "enable,disable" = *"${SERVICE['action']}"* ]] || [ "${SERVICE['service']}" = "daemon-reload" ]; then
+					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+				elif [ "$(systemctl is-active ${SERVICE['service']})" = "active" ]; then
+					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+				elif [ "${SERVICE['action']}" = "stop" ]; then
+					echo -e "${idsCL[Red]}STOPPED${idsCL[Default]}"
+				else
+					echo -e "${idsCL[Red]}ERROR${idsCL[Default]}"
+				fi
+			fi			
+		fi
+	fi
+	
+	if [ ${QUIET} -eq 0 ]; then
+		echo
+		echo -e "${idsCL[Green]}${NM_SERVICE_DESC[${SERVICE['service']}]} has been ${NM_SRVCOPTS[${SERVICE['action']}]}ed${idsCL[Default]}"
+		echo
+	fi
+}
+
+
+
+

inc/vCenter-SSL.ps1

@@ -0,0 +1,306 @@
+#!/usr/bin/env pwsh
+# -----------------------------------------------------------------------------------
+# vCenter Machine SSL Automation Script (vSphere 8.0 U3)
+# - Uses Let's Encrypt via Posh-ACME and PowerDNS
+# - Skips issuance if existing cert has >30 days
+# - Pushes cert into vCenter using Set-VIMachineCertificate
+# - Adds CA chain to trusted store
+# - Restarts vpxd (Restart-VIApplianceService)
+# - Performs Veeam Rescan-VBREntity when certificate changes
+# - Fully non-interactive (no prompts)
+# -----------------------------------------------------------------------------------
+
+. /opt/idssys/nodemgmt/conf/powerwall/settings.ps1
+
+$ErrorActionPreference = 'Stop'
+$ConfirmPreference     = 'None'   # Disable all PowerCLI confirmations
+
+# ----------------------------
+# Logging
+# ----------------------------
+$LogFile = "/opt/idssys/nodemgmt/logs/vc-ssl.log"
+
+function Write-Log {
+    param(
+        [ValidateSet('INFO','WARN','ERROR')]
+        [string]$Level,
+        [string]$Message,
+        [string]$ForegroundColor
+    )
+
+    $ts = Get-Date -Format 'yyyy-MM-dd HH:mm:ss'
+    $line = "[$ts] $Level : $Message"
+
+    if ($ForegroundColor) {
+        Write-Host $line -ForegroundColor $ForegroundColor
+    } else {
+        Write-Host $line
+    }
+    try {
+        $dir = Split-Path $LogFile
+        if (-not (Test-Path $dir)) {
+            New-Item -ItemType Directory -Path $dir -Force | Out-Null
+        }
+        Add-Content -Path $LogFile -Value $line
+    } catch {}
+}
+
+function Show-Failure {
+    param([System.Management.Automation.ErrorRecord]$ErrorRecord)
+    $msg = $ErrorRecord.Exception.Message
+
+    Write-Log ERROR $msg  Red
+    Write-Host "======================================================" -ForegroundColor Red
+    Write-Host "ERROR: $msg" -ForegroundColor Red
+    Write-Host "======================================================"  -ForegroundColor Red
+    exit 1
+}
+
+# ----------------------------
+# Constants
+# ----------------------------
+$RenewalWindow = 30
+$DnsSleep      = 15
+
+# ----------------------------
+# Load PowerCLI + Posh-ACME
+# ----------------------------
+Write-Log INFO "Loading Modules..."
+try {
+    if (-not (Get-Module -ListAvailable -Name VCF.PowerCLI)) {
+        Install-Module VCF.PowerCLI -Force -Scope AllUsers -AllowClobber
+    }
+
+    Import-Module VCF.PowerCLI -ErrorAction Stop *>$null
+    Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false `
+        -ParticipateInCEIP:$false -DisplayDeprecationWarnings:$false | Out-Null
+
+    Write-Log INFO "VCF.PowerCLI loaded."
+} catch { Show-Failure $_ }
+
+try {
+    if (-not (Get-Module -ListAvailable -Name Posh-ACME)) {
+        Install-Module Posh-ACME -Force -Scope AllUsers
+    }
+    Import-Module Posh-ACME -ErrorAction Stop *>$null
+    Write-Log INFO "Posh-ACME loaded."
+} catch { Show-Failure $_ }
+
+# ----------------------------
+# Connect to vCenter
+# ----------------------------
+try {
+    Write-Log INFO "Connecting to vCenter $VCENTERHOST..."
+    Connect-VIServer -Server $VCENTERHOST -User $VCENTERUSER -Password $VCENTERPASS -Force | Out-Null
+
+    Write-Host "========================================" -ForegroundColor Green
+    Write-Host "SUCCESS: Connected to vCenter." -ForegroundColor Green
+    Write-Host "========================================" -ForegroundColor Green
+} catch { Show-Failure $_ }
+
+# ----------------------------
+# Sanity check: list VMs
+# ----------------------------
+try {
+    $vms = Get-VM
+    Write-Log INFO "Retrieved $($vms.Count) VMs from vCenter."
+} catch {
+    Write-Log WARN "Failed to enumerate VMs: $($_.Exception.Message)"  Orange
+}
+
+# ----------------------------
+# Detect existing Posh-ACME cert
+# ----------------------------
+$paCert = $null
+$needNewCert = $false
+
+try {
+    $allCerts = Get-PACertificate -List
+    if ($allCerts) {
+        Write-Log INFO "Found $($allCerts.Count) Posh-ACME cert(s)."
+        $paCert = $allCerts |
+            Where-Object { $_.MainDomain -eq $VCENTERHOST -or ($_.AllSANs -contains $VCENTERHOST) } |
+            Sort-Object NotAfter -Descending |
+            Select-Object -First 1
+    }
+} catch {
+    Write-Log WARN "Failed to query Posh-ACME certificates: $($_.Exception.Message)"  Orange
+}
+
+if ($paCert) {
+    $daysLeft = ($paCert.NotAfter - (Get-Date)).TotalDays
+    Write-Log INFO ("Existing cert expires {0} (~{1:N0} days)." -f $paCert.NotAfter, $daysLeft)
+
+    if ($daysLeft -le $RenewalWindow) {
+        Write-Log INFO "Existing cert within $RenewalWindow days. ACME issuance required."
+        $needNewCert = $true
+    } else {
+        Write-Log INFO "Skipping issuance — certificate valid >$RenewalWindow days."
+        $needNewCert = $false
+    }
+} else {
+    Write-Log WARN "No existing cert found — issuance required."  Orange
+    $needNewCert = $true
+}
+
+# ----------------------------
+# ACME issuance (only if needed)
+# ----------------------------
+if ($needNewCert) {
+    try {
+        Write-Log INFO "Requesting new ACME certificate via Posh-ACME..."
+
+        $pluginArgs = @{
+            PowerDNSApiHost    = $WDNSHOST
+            PowerDNSApiKey     = (ConvertTo-SecureString $PDNSAPI -AsPlainText -Force)
+            PowerDNSUseTLS     = $true
+            PowerDNSPort       = 443
+            PowerDNSServerName = 'localhost'
+        }
+
+        # Posh-ACME v4 syntax:
+        New-PACertificate `
+            -Domain $VCENTERHOST `
+            -Plugin PowerDNS `
+            -PluginArgs $pluginArgs `
+            -Contact $ACMEEMAIL `
+            -AcceptTOS `
+            -DnsSleep $DnsSleep `
+            -Verbose `
+            -Force
+
+        $paCert = Get-PACertificate
+        Write-Log INFO ("New certificate issued: NotAfter={0}" -f $paCert.NotAfter)
+    } catch {
+        Write-Log ERROR ("ACME issuance failed: {0}" -f $_.Exception.Message)  Red
+        if (-not $paCert) {
+            Write-Log ERROR "No fallback certificate exists — aborting."  Red
+            exit 1
+        }
+        Write-Log WARN "Using existing Posh-ACME certificate."  Orange
+    }
+}
+
+if (-not $paCert) {
+    Write-Log ERROR "No usable certificate available — aborting."  Red
+    exit 1
+}
+
+if ($needNewCert) {
+        # # ----------------------------
+        # # Certificate file resolution
+        # # ----------------------------
+        $certFolder = Split-Path $paCert.CertFile -Parent
+
+        $certPath  = Join-Path $certFolder "cert.cer"
+        $keyPath   = Join-Path $certFolder "cert.key"
+        $chainPath = Join-Path $certFolder "chain.cer"
+
+        Write-Log INFO "Using cert folder: $certFolder"
+        Write-Log INFO "  CERT : $certPath"
+        Write-Log INFO "  KEY  : $keyPath"
+        Write-Log INFO "  CHAIN: $chainPath"
+
+        foreach ($f in @($certPath,$keyPath,$chainPath)) {
+            if (-not (Test-Path $f)) {
+                Write-Log ERROR "Missing cert file: $f"  Red
+                exit 1
+            }
+        }
+
+        # ----------------------------
+        # Add CA chain to trusted store (remove duplicates)
+        # ----------------------------
+        try {
+            Write-Log INFO "Cleaning old CA trust entries..."
+            $issuer = ($paCert.Issuer)
+            $existingCA = Get-VITrustedCertificate | Where-Object { $_.Subject -eq $issuer }
+            foreach ($ca in $existingCA) {
+                Remove-VITrustedCertificate -Certificate $ca -Confirm:$false -ErrorAction SilentlyContinue
+            }
+
+            $pemChain = Get-Content $chainPath -Raw
+            Write-Log INFO "Adding CA chain to vCenter trust store..."
+            Add-VITrustedCertificate -PemCertificateOrChain $pemChain -VCenterOnly -Confirm:$false | Out-Null
+
+        } catch {
+            Write-Log WARN "Failed to manage CA trust entries: $($_.Exception.Message)" -FvoregroundColor Orange
+        }
+
+        # ----------------------------
+        # Compare current vCenter cert
+        # ----------------------------
+        $needPush = $true
+        try {
+            $vcCert = Get-VIMachineCertificate -VCenterOnly -ErrorAction Stop
+            Write-Log INFO ("Current vCenter cert: Subject={0} NotAfter={1}" -f $vcCert.Subject, $vcCert.NotValidAfter)
+
+            if ($vcCert.Thumbprint -eq $paCert.Thumbprint) {
+                Write-Log INFO "vCenter already using this certificate."
+                $needPush = $false
+            }
+        } catch {
+            Write-Log WARN "Unable to read vCenter cert, assuming update required."  Orange
+        }
+
+        # ----------------------------
+        # Apply new certificate
+        # ----------------------------
+        if ($needPush) {
+
+            Write-Log INFO "Applying new Machine SSL certificate..."
+
+            $leafPem = Get-Content $certPath -Raw
+            $keyPem  = Get-Content $keyPath -Raw
+
+            try {
+                Set-VIMachineCertificate -PemCertificate $leafPem -PemKey $keyPem -Confirm:$false | Out-Null
+
+                Write-Host "===========================================================" -ForegroundColor Green
+                Write-Host "SUCCESS: vCenter Machine SSL certificate updated." ForegroundColor Green
+                Write-Host "===========================================================" -ForegroundColor Green
+
+                Write-Log INFO "Certificate updated successfully."
+
+                # ----------------------------
+                # Restart vpxd service
+                # ----------------------------
+                try {
+                    Write-Log INFO "Restarting vpxd via Restart-VIApplianceService..."
+                    $svc = Get-VIApplianceService -Name 'vpxd' -ErrorAction Stop
+                    $null = $svc | Restart-VIApplianceService -Confirm:$false
+                    Write-Log INFO "vpxd restarted successfully."
+                } catch {
+                    Write-Log WARN "vpxd restart failed: $($_.Exception.Message)"  Orange
+                }
+
+                # ----------------------------
+                # Trigger Veeam rescan
+                # ----------------------------
+                if ($VEEAMHOSTSSH) {
+                    try {
+                        Write-Log INFO "Triggering Veeam host rescan on $VEEAMHOSTSSH..."
+                        $veeamCmd = "Rescan-VBREntity -AllHosts"
+                        $sshCmd = "ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 $VEEAMHOSTSSH '$veeamCmd'"
+                        $result = bash -c $sshCmd
+                        Write-Log INFO "Veeam rescan result: $result"
+                    } catch {
+                        Write-Log WARN "Veeam rescan failed: $($_.Exception.Message)"  Orange
+                    }
+                }
+
+            } catch {
+                Show-Failure $_
+            }
+
+        } else {
+            Write-Log INFO "No certificate update needed. Skipping vpxd restart + Veeam rescan."
+        }
+}
+
+# ----------------------------
+# Script Complete
+# ----------------------------
+Write-Host "==========================================================" -ForegroundColor Green
+Write-Host "INFO: Script complete. Log: $LogFile" -ForegroundColor Green
+Write-Host "==========================================================" -ForegroundColor Green

inc/vCenter-SSL.ps1.bak

@@ -0,0 +1,247 @@
+#!/usr/bin/env pwsh
+. /opt/idssys/nodemgmt/conf/powerwall/settings.ps1
+
+function Show-Failure {
+    $global:helpme = $body
+    $global:helpmoref = $moref
+    $global:result = $_.Exception.Response.GetResponseStream()
+    $global:reader = New-Object System.IO.StreamReader($global:result)
+    $global:responseBody = $global:reader.ReadToEnd();
+    Write-Host -BackgroundColor:Black -ForegroundColor:Red "Status: A system exception was caught."
+    Write-Host -BackgroundColor:Black -ForegroundColor:Red $global:responsebody
+    Write-Host -BackgroundColor:Black -ForegroundColor:Red "The request body has been saved to `$global:helpme"
+    break
+}
+
+$vCenterURL = $VCENTERHOST
+$CommonName = $VCENTERHOST
+$EmailContact = $ACMEEMAIL
+
+#[string]$userName = $VCENTERUSER
+#[string]$userPassword = $VCENTERPASS
+#[SecureString]$secureString = ConvertTo-SecureString $VCENTERPASS -AsPlainText -Force 
+[PSCredential]$Credential = New-Object System.Management.Automation.PSCredential -ArgumentList $VCENTERUSER, (ConvertTo-SecureString $VCENTERPASS -AsPlainText -Force)
+
+$pArgs = @{
+    PowerDNSApiHost = $WDNSHOST
+    PowerDNSApiKey = $PDNSAPI | ConvertTo-SecureString -AsPlainText -Force
+    #PowerDNSApiKey = (Read-Host "API Key" -AsSecureString)
+    PowerDNSUseTLS = $true
+    PowerDNSPort = 443
+    PowerDNSServerName = 'localhost'
+}
+    
+
+Write-Host "Checking for Required Module Posh-ACME" -ForegroundColor Green
+    
+if (Get-Module -ListAvailable -Name Posh-ACME) {
+    Write-Host "Posh-ACME Module Already Installed" -ForegroundColor Green
+}
+else {
+    Write-Host "Posh-ACME Module Not Found, Attempting to Install" -ForegroundColor Yellow
+    Write-Host "Restart of this Script is Required!" -ForegroundColor Yellow
+    Install-Module -Name Posh-ACME -Force -Confirm:$false
+    Return
+}
+
+Do { 
+    Write-host "Waiting to for Posh-ACME Module to be Loaded" -ForegroundColor Cyan
+    $PoshACME = Get-Module -ListAvailable -Name Posh-ACME
+    Start-Sleep -Seconds 5
+}
+While ( $PoshACME -eq $null )
+
+# --- Importing the Posh-ACME Module.
+if (Get-Module -ListAvailable -Name Posh-ACME) {
+    Write-Host "Importing Posh-ACME Module" -ForegroundColor Green
+    Import-Module -Name Posh-ACME -Force
+}
+Else {
+    Write-host "Something Went Wrong, Stopping Script" -ForegroundColor Red
+    Break
+}
+
+if ((Get-PAServer).name -eq "LE_PROD") {
+    Write-Host "ACME Server Already Set to $((Get-PAServer).Name)" -ForegroundColor Green
+}
+else {
+    Write-Host "Setting ACME Server to LE_PROD" -ForegroundColor Yellow
+    Set-PAServer -DirectoryUrl LE_PROD
+} 
+
+#Set-PAServer LE_PROD
+
+$PAAccount = Get-PAAccount
+If ($PAAccount) {
+    Write-host "ACME Account Found with Contact: "$($PAAccount).Contact.split(":")[1]""
+}
+Else {
+    Write-Host "ACME Account Not Found, Setting ACME Account with Contact $($EmailContact)"
+    New-PAAccount -Contact $EmailContact -AcceptTOS -Force -Confirm:$false
+}
+    
+if (-not ([System.Management.Automation.PSTypeName]'ServerCertificateValidationCallback').Type) {
+    $certCallback = @"
+    using System;
+    using System.Net;
+    using System.Net.Security;
+    using System.Security.Cryptography.X509Certificates;
+    public class ServerCertificateValidationCallback
+    {
+        public static void Ignore()
+        {
+            if(ServicePointManager.ServerCertificateValidationCallback ==null)
+            {
+                ServicePointManager.ServerCertificateValidationCallback += 
+                    delegate
+                    (
+                        Object obj, 
+                        X509Certificate certificate, 
+                        X509Chain chain, 
+                        SslPolicyErrors errors
+                    )
+                    {
+                        return true;
+                    };
+            }
+        }
+    }
+"@
+    Add-Type $certCallback
+}
+[ServerCertificateValidationCallback]::Ignore() 
+
+$auth = [System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($Credential.UserName + ':' + $Credential.GetNetworkCredential().Password))
+$head = @{
+    'Authorization' = "Basic $auth"
+}
+ 
+$Params = @{
+ 
+    Method  = "POST"
+    Headers = $head
+    Uri     = "https://$vCenterURL/rest/com/vmware/cis/session"
+}
+ 
+#if ($IsCoreCLR) {
+    $Params.Add("SkipCertificateCheck", $true)
+#}
+ 
+try {
+    $RestApi = Invoke-WebRequest @Params
+    $token = (ConvertFrom-Json $RestApi.Content).value
+    $session = @{'vmware-api-session-id' = $token }
+    Write-Host "Session Token Created Successfully" -ForegroundColor Green
+}
+catch {
+    Write-Error "Unable to get Session Token, Terminating Script"
+    Show-Failure
+}
+
+$Question = "No"
+$CheckSLL = Get-PACertificate -MainDomain $CommonName
+$RUN=$true
+If ((($CheckSLL).AllSANs) -eq $CommonName) {
+    $daysUntilExpiration = (New-TimeSpan -Start (Get-Date) -End $CheckSLL.NotAfter).Days
+    If ($daysUntilExpiration -lt 30) {
+        Write-Host "Renewing cert for '$("$CommonName")' " -ForegroundColor Yellow
+        Submit-Renewal $CommonName
+    }
+    else {
+        Write-Host "Cert '$("$CommonName")' not ready for renewal" -ForegroundColor Yellow
+        $RUN=$false
+    }
+}
+else {
+    # --- Generate Free Let's Encrypt 90 Day SSL - Requires you to Validatr Domain Ownership.
+    If ($Question -match '^(No|N)$') {
+        If ($EmailContact) {
+            New-PACertificate $CommonName -AcceptTOS -Contact $EmailContact -PreferredChain "ISRG Root X1" -Plugin PowerDNS -PluginArgs $pArgs -Force
+            Write-Host "Requesting SSL for '$($CommonName)'" -ForegroundColor Green
+        }
+        else {
+            New-PACertificate $CommonName -AcceptTOS -PreferredChain "ISRG Root X1" -Plugin PowerDNS -PluginArgs $pArgs -Force
+            Write-Host "Requesting SSL for '$($CommonName)' Without Contact Email" -ForegroundColor Green
+        }
+    }
+}
+
+
+If ($RUN -eq $true) {
+
+Write-Host "Downloading ROOT CA" -ForegroundColor Green
+$wc = [System.Net.WebClient]::new()
+$rootCaPath = 'https://letsencrypt.org/certs/isrgrootx1.pem.txt'
+$publishedHash = '22B557A27055B33606B6559F37703928D3E4AD79F110B407D04986E1843543D1'
+$FileHash = Get-FileHash -InputStream ($wc.OpenRead($rootCaPath))
+
+If ($FileHash.Hash -eq $publishedHash) {
+    $root_CA = (New-Object System.Net.WebClient).DownloadString($rootCaPath)
+    Write-Host "Successfully Validated ROOT CA" -ForegroundColor Green
+}
+else {
+    Throw "Could not validate ROOT CA - Please Raise an Issue at https://github.com/virtuallywired/Install-vCenterSSL"
+}
+Write-Host "Loading Certificate Files" -ForegroundColor Green
+$sslcert = ((Get-Content ((Get-PACertificate).FullChainFile)) + $root_CA) -replace "`t|`n|`r", ""
+$privatekey = Get-Content ((Get-PACertificate).KeyFile)
+$fullchain = ((Get-Content ((Get-PACertificate).ChainFile)) + $root_CA) -replace "`t|`n|`r", ""
+
+Write-Host "Reformating Certificates to String" -ForegroundColor Green
+
+$cert = ((([string]$sslcert).Replace(" ", "")`
+    ).Replace("-----BEGINCERTIFICATE-----", "-----BEGIN CERTIFICATE-----\n")`
+).Replace("-----ENDCERTIFICATE-----", "\n-----END CERTIFICATE-----")
+
+$key = ((([string]$privatekey).Replace(" ", "")`
+    ).Replace("-----BEGINPRIVATEKEY-----", "-----BEGIN PRIVATE KEY-----\n")`
+).Replace("-----ENDPRIVATEKEY-----", "\n-----END PRIVATE KEY-----")
+
+$chain = ((([string]$fullchain).Replace(" ", "")`
+    ).Replace("-----BEGINCERTIFICATE-----", "-----BEGIN CERTIFICATE-----\n")`
+).Replace("-----ENDCERTIFICATE-----", "\n-----END CERTIFICATE-----"`
+).Replace("----------", "-----\n-----") 
+
+Write-Host "Creating Payload" -ForegroundColor Green
+
+$json = @"
+{
+    "cert": "$cert",
+    "key": "$key",
+    "root_cert": "$chain"
+    }
+"@
+$Params = @{
+    Method      = "PUT"
+    Headers     = $session
+    Uri         = "https://$vCenterURL/api/vcenter/certificate-management/vcenter/tls"
+    ContentType = "application/json"
+    Body        = $json
+}
+
+#if ($IsCoreCLR) {
+    $Params.Add("SkipCertificateCheck", $true)
+#}
+Write-Host "Preparing to Replace Certificate." -ForegroundColor Green
+
+try {
+    $Response = Invoke-WebRequest @Params
+    Write-Host "Response Code: $($Response.StatusCode)" -ForegroundColor Blue
+}
+catch {
+    Write-Error "Failed to Replace Certificate, Terminating Script"
+    Show-Failure
+}
+
+If ($Response.StatusCode -eq "204") {
+    Write-Host "Successfully Replaced Certificate" -ForegroundColor Green
+    Write-Host "After this operation completes, the services using the certificate will be restarted for the new certificate to take effect." -ForegroundColor Green
+}
+else {
+
+    Write-Error "Failed to Replace Certificate, Please verify Correct Configuration and Retry"
+}
+
+ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 $VEEAMHOSTSSH "Rescan-VBREntity -AllHosts"
+
+}

install.sh

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Wrapper script for install, for easier execution via URL.
+
+source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)"
+source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)"
+
+echo -e "\n${idsCL[LightGreen]}NodeMgmt Installation Script${idsCL[Default]}"
+
+$APTFUNC -y install wget curl git
+
+set -eu
+git clone https://git.schroedercity.com/voltron/NodeMgmt.git /opt/idssys/nodemgmt
+ln -s /opt/idssys/nodemgmt/run.sh /usr/local/bin/nodemgmt
+ln -s /opt/idssys/nodemgmt/run.sh /usr/local/bin/nmg
+/bin/chmod +x /opt/idssys/nodemgmt/*.sh
+if [ ! -f /etc/rsyslog.d/01-ignore-session-messages.conf ]; then
+	cp /opt/idssys/nodemgmt/conf/rsyslog/01-ignore-session-messages.conf /etc/rsyslog.d/
+	systemctl restart rsyslog
+fi
+
+if [ ! -d "/opt/idssys/defaults" ]; then
+	set -eu
+	git clone https://git.schroedercity.com/voltron/iDS-Defaults.git /opt/idssys/defaults
+fi
+
+echo -e "NODE_HOSTNAME=\"$(hostname)\"
+#LOCAL_SERVICES=mysql,nginx,gitea,haproxy,keepalived,maxscale
+
+#(optional)
+# EMAIL_NOTICE=email@address.com
+# PUSHOVER_APP_TOKEN=\"a2tk778mwe9b3tks1u16juas4rztjr\"
+# PUSHOVER_USER_TOKEN=\"\"
+
+" > /opt/idssys/nodemgmt/conf/settings.conf
+
+echo -e "\n${idsCL[Yellow]}NodeMgmt has been Installed${idsCL[Default]}\n"
+echo -e "To run, use the command: ${idsCL[Green]}nodemgmt${idsCL[Default]}\n\n"
+
+exit 0

run.sh

@@ -1,31 +1,28 @@
 #!/usr/bin/env bash
 # NodeMgmt Loader
 
-if [ -f /opt/idssys/settings/nodemgmt.conf ]; then
-	mv /opt/idssys/settings/nodemgmt.conf /opt/idssys/nodemgmt/settings.conf
-fi
 
-source /opt/idssys/defaults/colors.inc
+[ "${2}" != "q" ] && source /opt/idssys/defaults/colors.inc
 source /opt/idssys/defaults/default.inc
-source /opt/idssys/nodemgmt/settings.conf
+source /opt/idssys/nodemgmt/conf/settings.conf
 source /opt/idssys/nodemgmt/defaults.inc
 
-if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]]; then
-	# if [ "${1}" = "gui" ]; then
-	# 	DISP_HEADER
-	# fi
-	
-	# if [ "${1}" != "guiX" ]; then
-	if curl -m 15 -s --head  --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then 
+# if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]] && [ "${1}" != "status" ]; then
+if [ "${1}" == "update" ] || ([ "${1}" == "update" ] && [ "${2}" == "nodes" ]) || ([ "${1}" == "update-nodes" ] && [ "${3}" != "sync" ]); then
+	if [ "${1}" == "update-nodes" ] || [ "${2}" == "nodes" ]; then
+		echo -e "\n${idsCL[LightGreen]}Updating Node-Manager${idsCL[Default]}"
+		echo -e "${idsCL[LightGreen]}-------------------------------------------${idsCL[Default]}"
+	fi
+	if curl -m 3 -s --head  --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then 
 		if [ "${2}" != "q" ]; then
 			echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}"
-			echo ""
+			echo 
 		fi
 		cd /opt/idssys/defaults
 		if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
 			if [ "${2}" != "q" ]; then
 				echo -en "\e[1A";
-				echo -e "\e[0K\r ${idsCL[LightCyan]}Installing updates...${idsCL[Default]}"
+				echo -e "${idsCL[LightCyan]}Updating iDSSYS-Defaults...${idsCL[Default]}"
 			fi
 			git fetch origin master >/dev/null 2>&1
 			git reset --hard origin/master >/dev/null 2>&1
@@ -35,34 +32,63 @@ if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]]; then
 			git pull >/dev/null 2>&1
 			git submodule update --remote >/dev/null 2>&1
 		fi
-		cd ${FOLDER}
-		# if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
-		if [ "`git log --pretty=%H ...refs/heads/dev^ | head -n 1`" != "`git ls-remote origin -h refs/heads/dev |cut -f1`" ]; then
-			if [ "${2}" != "q" ]; then
+		cd ${NM_FOLDER}
+		# if [ "`git log --pretty=%H ...refs/heads/dev^ | head -n 1`" != "`git ls-remote origin -h refs/heads/dev |cut -f1`" ]; then
+		if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
+			goforup=0
+			betacheck=$(${NM_SCRIPT} betacheck)
+			if [ "${betacheck}" == "true" ] && [ "${2}" != "q" ]; then
 				echo -en "\e[1A";
-				echo -e "\e[0K\r ${idsCL[LightCyan]}Installing updates...${idsCL[Default]}"
+				echo -en "\e[0K\r${idsCL[LightCyan]}This update is currently in BETA, proceed (N/y)? ${idsCL[Default]}"
+				read -n1 choice
+				case $choice in
+					[Yy]) echo; goforup=1;;
+				esac
+			elif [ "${betacheck}" == "true" ] && [ "${2}" == "q" ]; then
+				goforup=0
+			else
+				goforup=1
 			fi
-			# git fetch origin master >/dev/null 2>&1
-			# git reset --hard origin/master >/dev/null 2>&1
-			git fetch origin dev >/dev/null 2>&1
-			git reset --hard origin/dev >/dev/null 2>&1
-			git reflog expire --expire=now --all >/dev/null 2>&1
-			git repack -ad >/dev/null 2>&1
-			git prune >/dev/null 2>&1
-			git pull >/dev/null 2>&1
-			git submodule update --remote >/dev/null 2>&1
-			/bin/chmod +x /opt/idssys/nodemgmt/nodemgmt-scripts.sh 2>&1
-			if [ "${2}" != "q" ]; then
-				echo -en "\e[1A";
-				echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}"
-			fi			
+			if [ ${goforup} -eq 1 ]; then
+				if [ "${2}" != "q" ]; then
+					echo -en "\e[1A";
+					echo -e "\e[0K\r ${idsCL[LightCyan]}Updating NodeMgmt...${idsCL[Default]}"
+				fi
+				git fetch origin master >/dev/null 2>&1
+				git reset --hard origin/master >/dev/null 2>&1
+				# git fetch origin dev >/dev/null 2>&1
+				# git reset --hard origin/dev >/dev/null 2>&1
+				git reflog expire --expire=now --all >/dev/null 2>&1
+				git repack -ad >/dev/null 2>&1
+				git prune >/dev/null 2>&1
+				git pull >/dev/null 2>&1
+				git submodule update --remote >/dev/null 2>&1
+				/bin/chmod +x /opt/idssys/nodemgmt/*.sh 2>&1
+				source ${NM_FOLDER}/defaults.inc
+				if [ "${2}" != "q" ]; then
+					echo -en "\e[1A";
+					echo -e "\e[0K\r ${idsCL[Green]}Updated to v${VERS}${idsCL[Default]}"
+				else
+					echo -e "${idsCL[Green]}Updated to v${VERS}${idsCL[Default]}"
+				fi
+			fi
+					
 		elif [ "${2}" != "q" ]; then
 			echo -en "\e[1A";
 			echo -e "\e[0K\r ${idsCL[LightCyan]}No Updates Available${idsCL[Default]}"
+		elif [ "${2}" == "q" ]; then
+			echo -e "${idsCL[LightCyan]}No Updates Available${idsCL[Default]}"
 		fi
 	else
 		echo -e "${idsCL[Red]}Could not connect to 'git.schroedercity.com' for updates${idsCL[Default]}"
 	fi
 fi
-${SCRIPT} ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} ${15} ${16} ${17} ${18} ${19} ${20} ${21} ${22} ${23} ${24} ${25}
+
+[ ! -f /usr/local/bin/nmg ] && ln -s /opt/idssys/nodemgmt/run.sh /usr/local/bin/nmg
+[ ! -f /usr/local/bin/ndmg ] && ln -s /opt/idssys/nodemgmt/run.sh /usr/local/bin/ndmg
+
+${NM_SCRIPT} "${1}" "${2}" "${3}" "${4}" "${5}" "${6}" "${7}" "${8}" "${9}" "${10}" "${11}" "${12}" "${13}" "${14}" "${15}" "${16}" "${17}" "${18}" "${19}" "${20}" "${21}" "${22}" "${23}" "${24}" "${25}"
+
 exit 0
+
+

ssl-cert-check/ssl-cert-check

@@ -573,7 +573,7 @@ usage()
 {
     echo "Usage: $0 [ -e email address ] [-E sender email address] [ -x days ] [-q] [-a] [-b] [-h] [-i] [-n] [-N] [-v]"
     echo "       { [ -s common_name ] && [ -p port] } || { [ -f cert_file ] } || { [ -c cert file ] } || { [ -d cert dir ] }"
-    echo ""
+    echo 
     echo "  -a                : Send a warning message through E-mail"
     echo "  -b                : Will not print header"
     echo "  -c cert file      : Print the expiration date for the PEM or PKCS12 formatted certificate in cert file"
@@ -593,7 +593,7 @@ usage()
     echo "  -v                : Specify a specific protocol version to use (tls, ssl2, ssl3)"
     echo "  -V                : Only print validation data"
     echo "  -x days           : Certificate expiration interval (eg. if cert_date < days)"
-    echo ""
+    echo 
 }
 
 
@@ -639,7 +639,7 @@ check_server_status() {
          TLSFLAG="${TLSFLAG} -servername $1"
     fi
 
-    echo "" | ${OPENSSL} s_client -crlf ${VER} -connect ${1}:${2} ${TLSFLAG} 2> ${ERROR_TMP} 1> ${CERT_TMP}
+    echo  | ${OPENSSL} s_client -crlf ${VER} -connect ${1}:${2} ${TLSFLAG} 2> ${ERROR_TMP} 1> ${CERT_TMP}
 
     if ${GREP} -i "Connection refused" ${ERROR_TMP} > /dev/null
     then

ssl-cert-check/ssldomains

@@ -1,21 +0,0 @@
-cloud.schroedercity.com 443
-dns.scity.us 443
-dyndns.scity.us 443
-git.schroedercity.com 443
-go.scity.us 443
-mail.scity.us 443
-media.scity.us 443
-mysql.scity.us 443
-pma.scity.us 443
-plex.scity.us 32400
-plex.schroedercity.com 443
-pwd.schroedercity.com 443
-status.scity.us 443
-statusint.scity.us 443
-stdiscosrv.scity.us 443
-unifistats.scity.us 443
-vcenter.scity.us 443
-vpn.scity.us 4433
-wdns.scity.us 443
-www.schroedercity.com 443
-www.scity.us 443

templates/haproxy.config

@@ -1,146 +0,0 @@
-global
-	pidfile /var/run/haproxy.pid
-    daemon
-    user haproxy
-    group haproxy
-    stats socket /var/run/haproxy.socket    user haproxy    group haproxy    mode 600 level admin
-    node haproxy_%NIP%
-    description haproxy    server
-
-    #* Performance Tuning
-    maxconn 8192
-    spread-checks 3
-    quiet
-defaults
-    #log global
-    mode tcp
-    option  dontlognull
-    option tcp-smart-accept
-    option tcp-smart-connect
-    #option dontlog-normal
-    retries 3
-    option redispatch
-    maxconn 8192
-    timeout check 3500ms
-    timeout queue 3500ms
-    timeout connect 3500ms
-    timeout client 10800s
-    timeout server 10800s
-
-    userlist STATSUSERS
-    group admin users admin
-    user admin insecure-password Dc$@1910
-    user stats insecure-password Dc$@1910
-
-listen admin_page
-    bind *:9600
-    mode http
-    stats enable
-    stats refresh 60s
-    stats uri /
-    acl AuthOkay_ReadOnly http_auth(STATSUSERS)
-    acl AuthOkay_Admin http_auth_group(STATSUSERS) admin
-    stats http-request auth realm admin_page unless AuthOkay_ReadOnly
-    # stats admin if AuthOkay_Admin
-
-listen MySQL_3307_rw
-    bind *:3307
-    mode tcp
-    timeout client 10800s
-    timeout server 10800s
-    tcp-check expect string is\ running
-    balance leastconn
-    option tcp-check
-    # option allbackups
-    default-server port 9200 inter 2s downinter 5s rise 3 fall 2 slowstart 60s    maxconn 64 maxqueue 128 weight 100
-    server 10.5.10.51 10.5.10.51:3306 check
-    server 10.5.10.52 10.5.10.52:3306 check backup
-    server 10.5.10.53 10.5.10.53:3306 check backup
-
-
-listen MySQL_3308_ro
-    bind *:3308
-    mode tcp
-    timeout client 10800s
-    timeout server 10800s
-    tcp-check expect string is\ running
-    balance leastconn
-    option tcp-check
-    # option allbackups
-    default-server port 9200 inter 2s downinter 5s rise 3 fall 2 slowstart 60s    maxconn 64 maxqueue 128 weight 100
-    server 10.5.10.51 10.5.10.51:3306 check
-    server 10.5.10.52 10.5.10.52:3306 check
-    server 10.5.10.53 10.5.10.53:3306 check backup
-
-listen NGINX_http
-    bind *:80
-    mode tcp
-    timeout client 10800s
-    timeout server 10800s
-    # tcp-check expect string is\ running
-    balance leastconn
-    option tcp-check
-    # option allbackups
-    default-server port 9200 inter 2s downinter 5s rise 3 fall 2 slowstart 60s    maxconn 64 maxqueue 128 weight 100
-    cookie SERVERUSED insert indirect nocache
-    server 10.5.10.121 10.5.10.121:80 cookie s1 check port 80 send-proxy
-    server 10.5.10.122 10.5.10.122:80 cookie s2 check port 80 send-proxy
-	server 10.5.10.123 10.5.10.123:80 cookie s3 check port 80 send-proxy backup
-
-listen NGINX_https
-    bind *:443
-    mode tcp
-    timeout client 10800s
-    timeout server 10800s
-    # tcp-check expect string is\ running
-    balance leastconn
-    option tcp-check
-    # option allbackups
-    default-server port 9200 inter 2s downinter 5s rise 3 fall 2 slowstart 60s    maxconn 64 maxqueue 128 weight 100
-    cookie SERVERUSED insert indirect nocache
-    server 10.5.10.121 10.5.10.121:443 cookie s1 check port 443 send-proxy
-    server 10.5.10.122 10.5.10.122:443 cookie s2 check port 443 send-proxy
-	server 10.5.10.123 10.5.10.123:443 cookie s3 check port 443 send-proxy backup
-
-listen Gitea
-    bind *:3000
-    mode tcp
-    timeout client 10800s
-    timeout server 10800s
-    # tcp-check expect string is\ running
-    balance leastconn
-    option tcp-check
-    # option allbackups
-    default-server port 9200 inter 2s downinter 5s rise 3 fall 2 slowstart 60s    maxconn 64 maxqueue 128 weight 100
-    cookie SERVERUSED insert indirect nocache
-    server 10.5.10.121 10.5.10.121:3000 cookie s1 check port 3000
-    server 10.5.10.122 10.5.10.122:3000 cookie s2 check port 3000 backup
-	server 10.5.10.123 10.5.10.123:3000 cookie s3 check port 3000 backup
-
-listen Nextcloud
-    bind *:3001
-    mode tcp
-    timeout client 10800s
-    timeout server 10800s
-    # tcp-check expect string is\ running
-    balance leastconn
-    option tcp-check
-    # option allbackups
-    default-server port 9200 inter 2s downinter 5s rise 3 fall 2 slowstart 60s    maxconn 64 maxqueue 128 weight 100
-    cookie SERVERUSED insert indirect nocache
-    server 10.5.10.42 10.5.10.42:443 cookie s1 check port 443 send-proxy
-    server 10.5.10.43 10.5.10.43:443 cookie s2 check port 443 send-proxy backup
-
-listen Maxscale_rw
-    bind *:3309
-    mode tcp
-    timeout client 10800s
-    timeout server 10800s
-    tcp-check expect string is\ running
-    balance leastconn
-    option tcp-check
-    # option allbackups
-    default-server port 9200 inter 2s downinter 5s rise 3 fall 2 slowstart 60s    maxconn 64 maxqueue 128 weight 100
-    server 10.5.10.51 10.5.10.51:4008 check
-    server 10.5.10.52 10.5.10.52:4008 check backup
-    # server 10.5.10.53 10.5.10.53:4008 check backup

templates/keepalive.config

@@ -1,32 +0,0 @@
-#haproxy - You can add more types manually after this.
-        
-vrrp_script chk_haproxy {
-   script "killall -0 haproxy"   # verify the pid existance
-   interval 2                    # check every 2 seconds
-   weight 2                      # add 2 points of prio if OK
-}
-vrrp_instance VI_HAPROXY {
-   interface ens192                # interface to monitor
-   state MASTER
-   virtual_router_id 51          # Assign one ID for this route
-   priority 104                   
-   unicast_src_ip 10.5.10.51
-   unicast_peer {
-	  10.5.10.52
-	  10.5.10.53
-	  10.5.10.120
-	  10.5.10.121
-
-   }
-   virtual_ipaddress {
-       10.5.10.56                        # the virtual IP
-   } 
-   track_script {
-       chk_haproxy
-   }
-#    notify /usr/local/bin/notify_keepalived.sh
-}
-
-# DO NOT REMOVE THE NEXT LINE
-#@S9S_NEXT_SECTION@
-

templates/nginx.proxy.site

@@ -2,29 +2,30 @@ server {
 	set $forward_scheme <<PROXY_SCHEME>>;
 	set $server         "<<PROXY_IP>>";
 	set $port           <<PROXY_PORT>>;
-
-	listen 80;
-	listen 443 ssl http2;
-
+	
 	server_name <<SERVER_NAME>>;
 	
-	<<SECURE>>
-
+	listen 80;
+	#listen 443 ssl;
+	
+	
+	#include conf.d/include/secure-access.conf;
+	
 	include conf.d/include/letsencrypt-acme-challenge.conf;
 	include conf.d/include/ssl-ciphers.conf;
-	#ssl_certificate /opt/lb-data/letsencrypt/live/<<MAIN_SITE>>/fullchain.pem;
-	#ssl_certificate_key /opt/lb-data/letsencrypt/live/<<MAIN_SITE>>/privkey.pem;
-
+	#ssl_certificate <<NM_CERTPATH>>/live/<<MAIN_SITE>>/fullchain.pem;
+	#ssl_certificate_key <<NM_CERTPATH>>/live/<<MAIN_SITE>>/privkey.pem;
+	
 	access_log /var/log/nginx/<<MAIN_SITE>>.proxy.log proxy;
 	error_log /var/log/nginx/<<MAIN_SITE>>.error.log warn;
 	
-	<<EXPLOITS>>
-	<<WEBSOCKET>>
-	<<HSTS>>
-
+	#include conf.d/include/block-exploits.conf;
+	#include conf.d/include/websocket-support.conf;
+	#include conf.d/include/hsts-support.conf;
+	
 	location / {
-		<<WEBSOCKET>>
-		<<HSTS>>
+		#include conf.d/include/websocket-support.conf;
+		#include conf.d/include/hsts-support.conf;
 		include conf.d/include/force-ssl.conf;
 		include conf.d/include/proxy.conf;
 	}

templates/nginx.site

@@ -16,7 +16,7 @@ server {
 
 	location ~ \.php$ {
 		fastcgi_split_path_info ^(.+\.php)(/.+)$;
-		fastcgi_pass unix:/var/run/php/php8.2-fpm.sock;
+		fastcgi_pass unix:/var/run/php/php-fpm.sock;
 		include conf.d/include/php_fastcgi.conf;
 	}
 

templates/nginx.ssl.site

@@ -1,6 +1,7 @@
 server {
 	listen 80;
-	listen 443 ssl http2;
+	listen 443 ssl;
+	http2 on;
 
 	server_name <<HOSTNAME>>;
 	set $base <<HOSTNAME>>;
@@ -9,8 +10,8 @@ server {
 	access_log  /var/log/nginx/<<HOSTNAME>>-access.log;
 	error_log  /var/log/nginx/<<HOSTNAME>>-error.log warn;
 
-	ssl_certificate /etc/letsencrypt/live/<<HOSTNAME>>/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/<<HOSTNAME>>/privkey.pem;
+	ssl_certificate <<NM_CERTPATH>>/live/<<HOSTNAME>>/fullchain.pem;
+	ssl_certificate_key <<NM_CERTPATH>>/live/<<HOSTNAME>>/privkey.pem;
 	include conf.d/include/ssl-ciphers.conf;
 
 	index index.php index.html index.htm;
@@ -22,7 +23,7 @@ server {
 
 	location ~ \.php$ {
 		fastcgi_split_path_info ^(.+\.php)(/.+)$;
-		fastcgi_pass unix:/var/run/php/php8.2-fpm.sock;
+		fastcgi_pass unix:/var/run/php/php-fpm.sock;
 		include conf.d/include/php_fastcgi.conf;
 	}
 

tmp-logrotate

@@ -9,9 +9,18 @@ su root syslog
 }
 
 /var/log/wtmp {
-	size 10M
+	size 1M
 	create 0664 root utmp
 	rotate 3
 	compress
 	daily
 }
+
+/opt/idssys/nodemgmt/logs/logfile {
+	size 1M
+	create 0664 root root
+	rotate 3
+	monthly
+	notifempty
+	minsize 200000
+}

uninstall.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# Wrapper script for install, for easier execution via URL.
+
+source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)"
+source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)"
+
+
+if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}"
+else APTFUNC="${ATYPE}"
+fi
+echo 
+echo -e "${idsCL[LightGreen]}NodeMgmt Removal Script${idsCL[Default]}"
+
+
+do_with_root set -eu
+rm -f /usr/local/bin/nodemgmt
+rm -f /usr/local/bin/nmg
+rm -Rf /opt/idssys/nodemgmt
+
+IDSSYSF="`ls -l /opt/idssys/ | grep -c ^d`"
+if [ "$IDSSYSF" = 2 ]; then
+	rm -Rf /opt/idssys/defaults
+fi
+
+echo 
+echo -e "${idsCL[LightRed]}NodeMgmt has been Removed${idsCL[Default]}"
+echo 
+
+exit 0