Compare commits
No commits in common. "master" and "master_old_version_v1" have entirely different histories.
master
...
master_old
9
.gitignore
vendored
9
.gitignore
vendored
|
|
@ -1,7 +1,4 @@
|
|||
.project
|
||||
.pydevproject
|
||||
./webserver-configuration
|
||||
nodes_*
|
||||
*.pyc
|
||||
*.pyo
|
||||
|
||||
|
||||
geo-cache/
|
||||
contact/
|
||||
|
|
|
|||
674
LICENSE
Normal file
674
LICENSE
Normal file
|
|
@ -0,0 +1,674 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
{one line to give the program's name and a brief idea of what it does.}
|
||||
Copyright (C) {year} {name of author}
|
||||
|
||||
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:
|
||||
|
||||
{project} Copyright (C) {year} {fullname}
|
||||
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>.
|
||||
21
LICENSE.txt
21
LICENSE.txt
|
|
@ -1,21 +0,0 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) 2016 Simon Wüllhorst
|
||||
|
||||
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:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
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.
|
||||
|
|
@ -1,88 +0,0 @@
|
|||
#!/usr/bin/python3
|
||||
import argparse
|
||||
# from parser.NodesParser import NodesParser
|
||||
# from parser.GraphParser import GraphParser
|
||||
from parser.Hopglass import Hopglass
|
||||
from cloud.Node import Node
|
||||
from cloud.Link import Link
|
||||
from cloud.GlobalGraph import GlobalGraph
|
||||
from parser.ShapesParser import ShapesParser
|
||||
from cloud.Domaene import Domaene
|
||||
from generator.NginxConfGen import NginxConfGen
|
||||
from info.Info import Info
|
||||
|
||||
class NodeHierarchy(object):
|
||||
def __init__(self):
|
||||
self.__args__ = self.__parseArguments__()
|
||||
self.__hopglass = Hopglass(self.__args__.raw_json)
|
||||
# self.__nodesJson__ = NodesParser(self.__args__.json_path)
|
||||
# self.__graphJson__ = GraphParser(self.__args__.json_path)
|
||||
self.__shapesJson__ = self.__parseShapes__()
|
||||
self.nodes = self.__createNodeObjects__()
|
||||
self.links = self.__createLinkObjects__()
|
||||
self.globalGraph = self.__createGlobalGraph__()
|
||||
self.domains = self.__createDomains__()
|
||||
self.nginxConf = NginxConfGen(self.domains, self.__args__)
|
||||
self.nginxConf.writeNginxConfigFile()
|
||||
self.infos = Info(self.__args__.info, self.__args__.info_out_path, self.__args__.info_out_type, self.__args__.info_filters, self.nodes, self.globalGraph, self.domains)
|
||||
|
||||
def __parseShapes__(self):
|
||||
shapesJson = {}
|
||||
for targetName in self.__args__.targets:
|
||||
shapesJson[targetName] = ShapesParser(self.__args__.shapes_path, targetName)
|
||||
return shapesJson
|
||||
|
||||
def __createDomains__(self):
|
||||
domains = {}
|
||||
for k, v in self.__shapesJson__.items():
|
||||
print('Create Domain object #',len(domains), '\r',end = '')
|
||||
domains[k] = Domaene(k,v, self.globalGraph)
|
||||
print('')
|
||||
return domains
|
||||
|
||||
def __createNodeObjects__(self):
|
||||
nodes = {}
|
||||
for nodeID, nodeValue in self.__hopglass.nodes.items():
|
||||
if nodeValue['nodeinfo']['node_id']:
|
||||
print('Create Node object #',len(nodes), '\r',end = '')
|
||||
nodes[nodeID] = Node(self.__prepareNodeData__(nodeValue))
|
||||
print('')
|
||||
return nodes
|
||||
|
||||
def __prepareNodeData__(self, nodeValue):
|
||||
if self.__args__.site_to_target_prefix:
|
||||
pref = self.__args__.site_to_target_prefix.split(',')
|
||||
try:
|
||||
nodeValue['nodeinfo']['system']['site_code'] = nodeValue['nodeinfo']['system']['site_code'].replace(pref[0],pref[1])
|
||||
except:
|
||||
pass
|
||||
return nodeValue
|
||||
|
||||
def __createLinkObjects__(self):
|
||||
links = []
|
||||
for linkParID, linkPar in self.__hopglass.links.items():
|
||||
for linkID, link in linkPar.items():
|
||||
print('Create Link object #',len(links), '\r',end = '')
|
||||
if linkParID[0] != 'null' and linkParID[1] != 'null':
|
||||
links.append(Link(link, (self.nodes[linkParID[0]], self.nodes[linkParID[1]])))
|
||||
print('')
|
||||
return links
|
||||
|
||||
def __createGlobalGraph__(self):
|
||||
return GlobalGraph(self.nodes, self.links, self.__args__.debug)
|
||||
|
||||
def __parseArguments__(self):
|
||||
parser = argparse.ArgumentParser(description='This Script generates a hierarchical nodes list for node migration using nginx geo feature.')
|
||||
parser.add_argument('-r', '--raw-json', required=False, default='https://karte.freifunk-muensterland.de/data/raw.json', help='Location of raw.json file (can be local folder or remote URL).')
|
||||
parser.add_argument('-s', '--shapes-path', required=False, default='https://freifunk-muensterland.de/md-fw-dl/shapes/', help='Path of shapefiles (can be local folder or remote URL).')
|
||||
parser.add_argument('-t', '--targets', nargs='+', required=True, help='List of targets which should be proceeded. Example: -t citya cityb ...')
|
||||
parser.add_argument('-sttp', '--site-to-target-prefix', required=False, help='Used to match site and target also when prefixes are different. Example: -sttp "ffmsd,domaene"')
|
||||
parser.add_argument('-o', '--out-file', default='./webserver-configuration', required=False, help='Filename where the generated Output should stored.')
|
||||
parser.add_argument('-v', '--debug', required=False, action='store_true', help='Enable debugging output.')
|
||||
parser.add_argument('-f', '--filters', nargs='*', required=False, choices=('exclude_clouds_with_lan_links', 'no_lan', 'domain_transitions_only'), help='Filter out nodes and local clouds based on filter rules.')
|
||||
parser.add_argument('-i', '--info', nargs='*', required=False, choices=('get_offline_nodes','offline'), help='Get infos about the graph, links and nodes.')
|
||||
parser.add_argument('-if', '--info-filters', nargs='*', required=False, help='Filter info results. Currently supported: min_age:TIME_RANGE, max_age:TIME_RANGE. Examples: -if min_age:1d max_age:2w')
|
||||
parser.add_argument('-iop', '--info-out-path', required=False, default='./', help='Folder where info files should be written. Default: ./')
|
||||
parser.add_argument('-iot', '--info-out-type', nargs='+', required=False, default='csv', choices=('json', 'csv'), help='Defines the format of info output. Default: csv')
|
||||
return parser.parse_args()
|
||||
NodeHierarchy()
|
||||
159
README.md
159
README.md
|
|
@ -1,147 +1,46 @@
|
|||
# Node Hierarchy
|
||||
Dieses Tool generiert auf Basis einer ``raw.json`` des [hopglass-server](https://github.com/hopglass/hopglass-server) sowie (Multi-)Polygonen (im [geojson](http://geojson.org/) Format) der einzelnen Zieldomänen eine [nginx](http://nginx.org/) Konfigurationsdatei (auf Basis des [Geo-Moduls](http://nginx.org/en/docs/http/ngx_http_geo_module.html)), um Knoten in der richtigen Reihenfolge umzuziehen.
|
||||
# Knoten Migrationstool
|
||||
Dieses Tool dient zur Generierung von nginx-Konfigurationsdateien für die Migration von Knoten von einer Domäne in eine andere Domäne. Dabei wird berücksichtigt, welche Knoten von anderen Knoten abhängen um ins Internet zu kommen.
|
||||
|
||||
## Konfiguration
|
||||
In der ``targets``-Datei werden Domänen (oder ähnliche Ziele) definiert. Hierbei handelt es sich um eine JSON-Datei. Dabei werden dort Gebietsrelationen für den Nominatik-Geocoder eingetragen.
|
||||
|
||||
## Vorgehensweise
|
||||
Das Tool zerteilt den (globalen) Graphen in viele lokale Graphen, also die Menge an Knoten (und Links), die vor Ort ein Mesh bilden. Diese werden auf Basis der Shapefiles den einzelnen Zieldomänen zugeordnet (es werden die Geopositionen der einzelnen Knoten "gemittelt"). Hier wird nun geprüft, welche Knoten keine Abhängigkeiten besitzen, also kein anderer Knoten über diesen Knoten gehen muss, um einen Gatewayserver zu erreichen. Diese werden dann in die Konfiguration geschrieben.
|
||||
|
||||
Sind diese Knoten aktualisiert, fällt die Abhängigkeit des Knoten weg, der zuvor benötigt wurde, um das Gateway zu erreichen. Daher muss das Tool regelmäßig ausgeführt und die Ausgabe jeweils in die nginx-Konfiguration übernommen werden.
|
||||
|
||||
|
||||
## Abhängigkeiten
|
||||
Das Tool läuft ausschließlich mit **Python >= 3**.
|
||||
Folgende (Python-)Abhängigkeiten werden benötigt:
|
||||
|
||||
- [shapely](https://pypi.python.org/pypi/Shapely)
|
||||
|
||||
Diese lassen sich wie folgt via [pip](https://pypi.python.org/pypi/pip) installieren:
|
||||
## Aufruf
|
||||
Es muss eine Datei mit den ``targets`` existieren.
|
||||
|
||||
Im einfachsten Fall wird das Programm dann wie folgt aufgerufen:
|
||||
```
|
||||
pip3 install shapely
|
||||
./node_hierarcy.py --all
|
||||
```
|
||||
|
||||
|
||||
## Bedienung
|
||||
Das Tool wird ausschließlich über Argumente beim Aufruf konfiguriert.
|
||||
|
||||
Die Hilfe liefert folgendes:
|
||||
Sollen spezielle ``nodes.json`` und ``graph.json`` Dateien verwendet werden, so kann der Datenpfad wie folgt angegeben werden (dabei kann es sich sowohl um einen lokalen Dateipfad, als auch um eine http oder https URL handeln):
|
||||
|
||||
```
|
||||
$ ./NodeHierarchy.py --help
|
||||
usage: NodeHierarchy.py [-h] [-r RAW_JSON] [-s SHAPES_PATH] -t TARGETS
|
||||
[TARGETS ...] [-sttp SITE_TO_TARGET_PREFIX]
|
||||
[-o OUT_FILE] [-v]
|
||||
[-f [{exclude_clouds_with_lan_links,no_lan,domain_transitions_only} [{exclude_clouds_with_lan_links,no_lan,domain_transitions_only} ...]]]
|
||||
[-i [{get_offline_nodes,offline} [{get_offline_nodes,offline} ...]]]
|
||||
[-if [INFO_FILTERS [INFO_FILTERS ...]]]
|
||||
[-iop INFO_OUT_PATH]
|
||||
[-iot {json,csv} [{json,csv} ...]]
|
||||
|
||||
This Script generates a hierarchical nodes list for node migration using nginx
|
||||
geo feature.
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
-r RAW_JSON, --raw-json RAW_JSON
|
||||
Location of raw.json file (can be local folder or
|
||||
remote URL).
|
||||
-s SHAPES_PATH, --shapes-path SHAPES_PATH
|
||||
Path of shapefiles (can be local folder or remote
|
||||
URL).
|
||||
-t TARGETS [TARGETS ...], --targets TARGETS [TARGETS ...]
|
||||
List of targets which should be proceeded. Example: -t
|
||||
citya cityb ...
|
||||
-sttp SITE_TO_TARGET_PREFIX, --site-to-target-prefix SITE_TO_TARGET_PREFIX
|
||||
Used to match site and target also when prefixes are
|
||||
different. Example: -sttp "ffmsd,domaene"
|
||||
-o OUT_FILE, --out-file OUT_FILE
|
||||
Filename where the generated Output should stored.
|
||||
-v, --debug Enable debugging output.
|
||||
-f [{exclude_clouds_with_lan_links,no_lan,domain_transitions_only} [{exclude_clouds_with_lan_links,no_lan,domain_transitions_only} ...]], --filters [{exclude_clouds_with_lan_links,no_lan,domain_transitions_only} [{exclude_clouds_with_lan_links,no_lan,domain_transitions_only} ...]]
|
||||
Filter out nodes and local clouds based on filter
|
||||
rules.
|
||||
-i [{get_offline_nodes,offline} [{get_offline_nodes,offline} ...]], --info [{get_offline_nodes,offline} [{get_offline_nodes,offline} ...]]
|
||||
Get infos about the graph, links and nodes.
|
||||
-if [INFO_FILTERS [INFO_FILTERS ...]], --info-filters [INFO_FILTERS [INFO_FILTERS ...]]
|
||||
Filter info results. Currently supported:
|
||||
min_age:TIME_RANGE, max_age:TIME_RANGE. Examples: -if
|
||||
min_age:1d max_age:2w
|
||||
-iop INFO_OUT_PATH, --info-out-path INFO_OUT_PATH
|
||||
Folder where info files should be written. Default: ./
|
||||
-iot {json,csv} [{json,csv} ...], --info-out-type {json,csv} [{json,csv} ...]
|
||||
Defines the format of info output. Default: csv
|
||||
./node_hierarcy.py --all --json-path https://service.freifunk-muensterland.de/maps/data/
|
||||
```
|
||||
|
||||
|
||||
### Anmerkungen
|
||||
|
||||
- ``--targets`` Gibt die Namen der Ziele (Zieldomänen) an. Der Geo-Schalter in der nginx-Konfiguration wird ebenfalls diesen Namen tragen.
|
||||
- ``--raw-json`` Gibt den Ort der raw.json (hopglass-server) an. Default: ``https://karte.freifunk-muensterland.de/data/raw.json``
|
||||
- ``--shapes-path`` Verzeichnis an dem die Shapefiles der einzelnen Ziel-Domänen liegen. Default: ``https://freifunk-muensterland.de/md-fw-dl/shapes/``
|
||||
- *Anmerkung:* Es werden Dateien in Abhängigkeit mit den Target-Namen im Verzeichnis erwartet.
|
||||
- *Beispiel:* Bei ``-targets domaene01 domaene02`` werden die Dateien ``domaene01.geojson`` und ``domaene02.geojson`` erwartet.
|
||||
- Falls ihr hier mehr Anpassbarkeit benötigt, eröffnet ein Issue, dann baue ich da was ein.
|
||||
- ``--filters`` Siehe Abschnitt *Filter*.
|
||||
|
||||
Der Rest ist trivial.
|
||||
|
||||
|
||||
### Filter
|
||||
Standardmäßig werden alle Knoten ausgefiltert, die offline sind. Außerdem werden alle lokalen Wolken ausgefiltert, in denen sich mindstens ein Knoten mit deaktiviertem Autoupdater befindet.
|
||||
|
||||
Weitere Filterungen lassen sich über das ``--filters`` Attribut aktivieren.
|
||||
|
||||
Folgende Filter sind derzeit implementiert (zukünftig folgen noch weitere):
|
||||
|
||||
- ``exclude_clouds_with_lan_links`` bzw. ``no_lan`` filtert alle lokalen Wolken aus, in denen sich mindestens ein Mesh-on-LAN Link befindet
|
||||
- ``domain_transitions_only`` filtert alle Knoten aus, die sich bereits in der richtigen Domäne befinden / die Firmware der richtigen Domäne besitzen
|
||||
|
||||
|
||||
## Nginx Konfiguration
|
||||
Das Tool generiert nur Konfigurationscode, der Schalter auf Basis von IPv6-Adressen beinhaltet. Die Auswirkungen, die diese Schalter haben sollen, müsst ihr noch selbst definieren. Typischerweise möchte man auf Basis der Schalter einen Rewrite machen.
|
||||
|
||||
Beispiel:
|
||||
Eine Ausgabe des Fortschritts erhält man mit dem Schalter ``-p`` oder ``--print-status``:
|
||||
|
||||
```
|
||||
if ($domaene01) {
|
||||
rewrite ^/site-ffms/(.*)$ /domaene01/$1;
|
||||
}
|
||||
./node_hierarcy.py --all -p
|
||||
```
|
||||
|
||||
*Anmerkung:* Bei $domane01 handelt es sich um den generierten Schalter, entspricht also ``--targets domaene01``.
|
||||
Eine Limitierung auf eine Auswahl an Targets aus der Targets-Datei kann mit dem Schalter ``-t`` oder ``--targets`` vorgenommen werden:
|
||||
```
|
||||
./node_hierarcy.py -t domaene_01 domaene_02 --print-status
|
||||
```
|
||||
|
||||
Weitere Hilfestellungen erhält man mit ``-h`` oder ``--help``:
|
||||
```
|
||||
./node_hierarcy.py
|
||||
```
|
||||
|
||||
## Info-Modul
|
||||
Über das Info-Modul ist es möglich Informationen über Knoten, Links, Graphen und Domänen zu erstellen. Diese Informationen können entweder in ``csv``-Dateien oder in ``json``-Dateien gespeichert werden. Derzeit ist nur das Modul ``get_offline_nodes`` verfügbar. Zusätzlich lassen sich an das Info-Modul Filter übergeben.
|
||||
### Ein- und Ausgabe
|
||||
Standardmäßig wird eine Datei ``targets.json`` erwartet. Soll diese Datei von einer anderen Stelle aufgerufen werden, kann das ``--targets-file``-Argument verwendet werden:
|
||||
```
|
||||
./node_hierarcy.py --targets-file /root/targets.json
|
||||
```
|
||||
|
||||
### Offline-Knoten
|
||||
Gibt Informationen zu Knoten aus, die offline sind. Dazu gibt es die folgenden beiden Filter:
|
||||
|
||||
- ``min_age:TIME_RANGE``: Knoten, die eine kürzere Zeit als die angegebene Zeit offline sind, werden ignoriert.
|
||||
- ``max_age:TIME_RANGE``: Knoten, die eine längere Zeit als die angegebene Zeit offline sind, werden ignoriert.
|
||||
|
||||
Dabei setzt sich ``TIME_RANGE`` aus zwei Teilen zusammen:
|
||||
- (Integer) Wert
|
||||
- Einheit:
|
||||
- ``d``, ``day`` oder ``days``: Der Wert wird als eine Anzahl von Tagen interpretiert.
|
||||
- ``w``, ``week`` oder ``weeks``: Der Wert wird als eine Anzahl von Wochen interpretiert.
|
||||
- ``m``, ``month`` oder ``months``: Der Wert wird als eine Anzahl von Monaten (30 Tage) interpretiert.
|
||||
|
||||
Der Beispielaufruf
|
||||
|
||||
``$ ./NodeHierarchy.py -t domaene01 -i get_offline_nodes -if max_age:2w min_age:1d``
|
||||
|
||||
schreibt in die Datei ``./offline_nodes.csv`` (default-Einstellung der Schalter ``-iop`` und ``-iot``) Informationen zu Knoten die länger als einen Tag aber kürzer als zwei Wochen offline sind (im CSV-Format).
|
||||
|
||||
|
||||
## Bekannte Probleme
|
||||
Wenn es sich bei der Quell-Domäne um eine L2TP-Domäne handelt, läuft das Tool derzeit nur, wenn [alfred](https://github.com/ffnord/ffnord-alfred-announce) oder respondd auf allen Gateway-Servern läuft.
|
||||
|
||||
*Anmerkung:* Wenn in der ``graph.json`` mehrere Domänen vorhanden sind und dort teilweise L2TP-Domänen vorhanden sind (dieses aber nicht das Gebiet eurer Zieldomäne betrifft), kann das sehr negative Auswirkungen auf die Laufzeit haben (> 30 Sekunden).
|
||||
|
||||
|
||||
## Lizenz
|
||||
Dieses Tool unterliegt der MIT Lizenz.
|
||||
Solltet ihr Probleme mit dieser Lizensierung haben, schreibt mich einfach an. ;)
|
||||
|
||||
2016 - Simon Wüllhorst
|
||||
Standardmäßig erfolgt die Ausgabe der generierten nginx-Konfigurationsdateien in das Verzeichnis ``./webserver-configuration/``. Das kann mit dem Schalter ``--out-path`` geändert werden:
|
||||
```
|
||||
./node_hierarcy.py --out-path /root/config/
|
||||
```
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
from cloud.LocalGraph import LocalGraph
|
||||
class Domaene(object):
|
||||
def __init__(self, name, shapes, globalGraph):
|
||||
self.name = name
|
||||
self.__shapes__ = shapes
|
||||
self.__globalGraph__ = globalGraph
|
||||
self.localGraphs = self.__getLocalGraphsInDomaene__()
|
||||
|
||||
def __getLocalGraphsInDomaene__(self):
|
||||
graphs = []
|
||||
for localGraph in self.__globalGraph__.localGraphs:
|
||||
if self.isLocalGraphInDomaene(localGraph) == True:
|
||||
graphs.append(localGraph)
|
||||
return graphs
|
||||
|
||||
def isLocalGraphInDomaene(self, localGraph):
|
||||
return self.isPointInDomaene(localGraph.getGeoCenterOfNodeCloud())
|
||||
|
||||
def isPointInDomaene(self, point):
|
||||
for shape in self.__shapes__.shapes:
|
||||
if point.within(shape):
|
||||
return True
|
||||
return False
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
from cloud.LocalGraph import LocalGraph
|
||||
from cloud.Graph import Graph
|
||||
from exceptions.HieraException import HieraException
|
||||
class GlobalGraph(Graph):
|
||||
def __init__(self, nodes, links, debugPrint = False):
|
||||
super().__init__(nodes, links)
|
||||
self.__enableDebugPrinting__ = debugPrint
|
||||
self.localGraphs = self.__buildLocalGraphs__()
|
||||
|
||||
if self.__enableDebugPrinting__:
|
||||
self.__debugPrint__()
|
||||
|
||||
def __buildLocalGraphs__(self):
|
||||
nodeIDs = self.getListOfNodeIDsOnline()
|
||||
localGraphs = []
|
||||
while len(nodeIDs) > 0:
|
||||
connectedNodes = self.__getConnectedNodes__(nodeIDs[0])
|
||||
try:
|
||||
localGraphs.append(self.__createLocalCloudByNodesList__(connectedNodes))
|
||||
print('Create LocalGraph object #',len(localGraphs), '\r',end = '')
|
||||
except HieraException:
|
||||
print('Was not able to add local cloud, because no VPN link was found.')
|
||||
nodeIDs = [x for x in nodeIDs if x not in connectedNodes]
|
||||
print('')
|
||||
return localGraphs
|
||||
|
||||
def __getConnectedNodes__(self, nodeID, trace = []):
|
||||
neighNodeIDs = self.getNeighbourNodeIDsForNodeID(nodeID)
|
||||
trace_new = list(set(trace + neighNodeIDs))
|
||||
for neighNodeID in neighNodeIDs:
|
||||
if neighNodeID not in trace:
|
||||
trace_new = list(set(trace_new + self.__getConnectedNodes__(neighNodeID, trace_new)))
|
||||
return trace_new
|
||||
|
||||
def __createLocalCloudByNodesList__(self, nodesIDList):
|
||||
nodes = {}
|
||||
links = []
|
||||
for nodeID in nodesIDList:
|
||||
if nodeID:
|
||||
nodes[nodeID] = self.__nodes__[nodeID]
|
||||
links = list(set(links + self.getLinksByNodeID(nodeID)))
|
||||
return LocalGraph(nodes, links, self.__enableDebugPrinting__)
|
||||
|
||||
def __debugPrint__(self):
|
||||
for localGraph in self.localGraphs:
|
||||
for node in localGraph.getNodesWithNoDependencies():
|
||||
print(node.hostname, node.publicIPv6Addresses)
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
from oauthlib.oauth1.rfc5849 import endpoints
|
||||
class Graph(object):
|
||||
def __init__(self, nodes, links):
|
||||
self.__nodes__ = nodes
|
||||
self.__links__ = links
|
||||
|
||||
def getListOfNodeIDs(self, getGateways = False):
|
||||
nodeIDs = []
|
||||
for k, v in self.__nodes__.items():
|
||||
if getGateways == True or v.isGateway == False:
|
||||
nodeIDs.append(k)
|
||||
return nodeIDs
|
||||
|
||||
def getListOfNodeIDsOnline(self, getGateways = False):
|
||||
onlineNodeIDs = []
|
||||
nodeIDs = self.getListOfNodeIDs(getGateways)
|
||||
for nodeID in nodeIDs:
|
||||
if self.__nodes__[nodeID].isOnline == True:
|
||||
onlineNodeIDs.append(nodeID)
|
||||
return onlineNodeIDs
|
||||
|
||||
def getNeighbourNodeIDsForNodeID(self, nodeID):
|
||||
neighNodeIDs = [nodeID]
|
||||
endpoints = []
|
||||
for link in self.__links__:
|
||||
if link.isVpn == False:
|
||||
endpoints = link.getEndpointNodeIDs(getGateways = False)
|
||||
if nodeID in endpoints:
|
||||
neighNodeIDs = list(set(neighNodeIDs + endpoints))
|
||||
return neighNodeIDs
|
||||
|
||||
def getLinksByNodeID(self, nodeID):
|
||||
links = []
|
||||
for link in self.__links__:
|
||||
endpoints = link.getEndpointNodeIDs()
|
||||
if nodeID in endpoints:
|
||||
if link not in links:
|
||||
links.append(link)
|
||||
return links
|
||||
|
||||
def getLinkCount(self):
|
||||
return len(self.__links__)
|
||||
|
||||
def getNodesCount(self):
|
||||
return len(self.__nodes__)
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
class Link(object):
|
||||
def __init__(self, LinkJsonObject, nodes):
|
||||
self.__jsonObject = LinkJsonObject
|
||||
self.linkType, self.isVpn = self.__getLinkType__()
|
||||
self.__nodes = nodes
|
||||
|
||||
def __getLinkType__(self):
|
||||
types = [x['type'] for x in self.__jsonObject]
|
||||
ltype = types[0]
|
||||
lvpn = False
|
||||
for x in types:
|
||||
if x != 'unknown' and x != 'other':
|
||||
if x == 'l2tp' or x == 'tunnel':
|
||||
lvpn = True
|
||||
val = x
|
||||
return ltype, lvpn
|
||||
|
||||
def getEndpointNodes(self, getGateways = False):
|
||||
return self.__nodes
|
||||
|
||||
def getEndpointNodeIDs(self, getGateways = True):
|
||||
return [x.nodeID for x in self.__nodes]
|
||||
|
||||
def isNodeIDinLink(self, nodeID):
|
||||
for x in self.__nodes:
|
||||
if nodeID == x.nodeID:
|
||||
return True
|
||||
return False
|
||||
|
||||
def isNodeInLink(self, node):
|
||||
return self.isNodeIDinLink(node.nodeID)
|
||||
|
|
@ -1,133 +0,0 @@
|
|||
from cloud.Graph import Graph
|
||||
from shapely.geometry import MultiPoint
|
||||
from exceptions.HieraException import HieraException
|
||||
class LocalGraph(Graph):
|
||||
def __init__(self, nodes, links, debugPrint = False):
|
||||
super().__init__(nodes, links)
|
||||
self.__enableDebugPrinting__ = debugPrint
|
||||
if self.__enableDebugPrinting__:
|
||||
self.__debugPrint__()
|
||||
|
||||
def getNodesWithVpn(self):
|
||||
nodes = []
|
||||
for link in self.__links__:
|
||||
if link.isVpn == True:
|
||||
nodes = nodes + [x for x in link.getEndpointNodes() if x not in nodes]
|
||||
return nodes
|
||||
|
||||
def getCountOfNodesWithVpn(self):
|
||||
return len(self.getNodesWithVpn())
|
||||
|
||||
def getDeptOfNode(self, node):
|
||||
return self.getDeptOfNodeByID(node.nodeID, [])
|
||||
|
||||
def getDeptOfNodeByID(self, nodeID, trace):
|
||||
if self.getCountOfNodesWithVpn() == 0:
|
||||
raise HieraException('No VPN Node in LocalCloud was found!')
|
||||
new_trace = trace[:]
|
||||
new_trace.append(nodeID)
|
||||
lowestDepth = None
|
||||
currentDept = None
|
||||
links = self.getLinksByNodeID(nodeID)
|
||||
endpoints = []
|
||||
for link in links:
|
||||
endpoints = endpoints + [x for x in link.getEndpointNodeIDs() if x not in endpoints]
|
||||
if link.isVpn == True:
|
||||
return 0
|
||||
for childNodeID in endpoints:
|
||||
if childNodeID not in new_trace:
|
||||
currentDept = self.getDeptOfNodeByID(childNodeID, new_trace + endpoints)
|
||||
if currentDept != None:
|
||||
currentDept = currentDept + 1
|
||||
if lowestDepth == None or currentDept < lowestDepth:
|
||||
lowestDepth = currentDept
|
||||
return lowestDepth
|
||||
|
||||
def getMaxDepth(self):
|
||||
maxDepth = 0
|
||||
for k,v in self.__nodes__.items():
|
||||
nodeDepth = self.getDeptOfNode(v)
|
||||
maxDepth = nodeDepth if nodeDepth > maxDepth else maxDepth
|
||||
return maxDepth
|
||||
|
||||
def getAllNodesWithDepthEquals(self, depth):
|
||||
nodes = []
|
||||
for k,v in self.__nodes__.items():
|
||||
if self.getDeptOfNode(v) == depth:
|
||||
nodes.append(v)
|
||||
return nodes
|
||||
|
||||
def getNodesWithNoDependencies(self):
|
||||
nodesWithNoDependencies = []
|
||||
for k,v in self.__nodes__.items():
|
||||
depth = self.getDeptOfNode(v)
|
||||
hasDependencies = False
|
||||
for link in self.getLinksByNodeID(k):
|
||||
for node in link.getEndpointNodes():
|
||||
if depth < self.getDeptOfNode(node):
|
||||
hasDependencies = True
|
||||
break
|
||||
if hasDependencies == True:
|
||||
break
|
||||
else:
|
||||
nodesWithNoDependencies.append(v)
|
||||
return nodesWithNoDependencies
|
||||
|
||||
def isAutoupdaterEnabledOnAllNodes(self):
|
||||
for k, v in self.__nodes__.items():
|
||||
if v.isAutoupdaterEnabled == False:
|
||||
return False
|
||||
return True
|
||||
|
||||
def getLanLinksInCloud(self):
|
||||
links = []
|
||||
for link in self.__links__:
|
||||
if link.linkType == 'other' and link.isVpn == False:
|
||||
links.append(link)
|
||||
return links
|
||||
|
||||
def areLanLinksInCloud(self):
|
||||
for link in self.__links__:
|
||||
if link.linkType == 'other' and link.isVpn == False:
|
||||
return True
|
||||
return False
|
||||
|
||||
def getBranchesThatExistsInCloud(self):
|
||||
branches = []
|
||||
for k, v in self.__nodes__.items():
|
||||
if v.autoupdaterBranch not in branches:
|
||||
branches.append(v.autoupdaterBranch)
|
||||
return branches
|
||||
|
||||
def getGeoCenterOfNodeCloud(self):
|
||||
geoPoints = []
|
||||
for k, v in self.__nodes__.items():
|
||||
if v.geo != None:
|
||||
geoPoints.append((v.geo['lon'], v.geo['lat']))
|
||||
return MultiPoint(geoPoints).representative_point()
|
||||
|
||||
def __debugPrint__(self):
|
||||
print('nodes:')
|
||||
for k,v in self.__nodes__.items():
|
||||
print('>',v.hostname)
|
||||
|
||||
print('nodes with vpn:')
|
||||
for node in self.getNodesWithVpn():
|
||||
print('>',node.hostname)
|
||||
|
||||
print('nodes with no dependencies:')
|
||||
for node in self.getNodesWithNoDependencies():
|
||||
print('>', node.hostname)
|
||||
|
||||
print('maxdepth:', self.getMaxDepth())
|
||||
print('isAutoupdaterEnabledOnAllNodes:', self.isAutoupdaterEnabledOnAllNodes())
|
||||
print('areLanLinksInCloud:', self.areLanLinksInCloud())
|
||||
print('BranchesThatExistsInCloud:', self.getBranchesThatExistsInCloud())
|
||||
print('lan links in cloud:')
|
||||
for link in self.getLanLinksInCloud():
|
||||
hosts = link.getEndpointNodes()
|
||||
if len(hosts) == 1:
|
||||
print(' ', hosts.hostname, 'has unknown neighbour.')
|
||||
else:
|
||||
print(' ', hosts[0].hostname, '<--->', hosts[1].hostname)
|
||||
print('=====')
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
from cloud.NodeInit import NodeInit
|
||||
class Node(NodeInit):
|
||||
def __init__(self, NodeJsonObject):
|
||||
super().__init__(NodeJsonObject)
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
class NodeInit(object):
|
||||
def __init__(self, NodeJsonObject):
|
||||
self.__jsonObject__ = NodeJsonObject
|
||||
self.nodeID = self.__jsonObject__['nodeinfo']['node_id']
|
||||
self.interfaces = self.__getInterfaces__()
|
||||
self.hostname = self.__jsonObject__['nodeinfo']['hostname']
|
||||
self.isGateway = self.__jsonObject__['nodeinfo']['isGateway']
|
||||
self.geo = self.__getGeo__()
|
||||
self.isAutoupdaterEnabled = self.__getAutoupdaterStatus__()
|
||||
self.autoupdaterBranch = self.__getBranch__()
|
||||
self.isOnline = self.__jsonObject__['nodeinfo']['isOnline']
|
||||
self.publicIPv6Addresses = self.__getPublicAddresses__()
|
||||
self.domName = self.__getSiteCode__()
|
||||
|
||||
def __getInterfaces__(self):
|
||||
try:
|
||||
return self.__jsonObject__['nodeinfo']['network']['mesh']['bat0']['interfaces']
|
||||
except:
|
||||
return {}
|
||||
|
||||
def __getAutoupdaterStatus__(self):
|
||||
try:
|
||||
return self.__jsonObject__['nodeinfo']['software']['autoupdater']['enabled']
|
||||
except:
|
||||
return False
|
||||
|
||||
def __getBranch__(self):
|
||||
try:
|
||||
return self.__jsonObject__['nodeinfo']['software']['autoupdater']['branch']
|
||||
except:
|
||||
return None
|
||||
|
||||
def __getGeo__(self):
|
||||
try:
|
||||
return {
|
||||
'lat' : self.__jsonObject__['nodeinfo']['location']['latitude'],
|
||||
'lon' : self.__jsonObject__['nodeinfo']['location']['longitude']
|
||||
}
|
||||
except:
|
||||
return None
|
||||
|
||||
def __getPublicAddresses__(self):
|
||||
addresses = []
|
||||
try:
|
||||
for address in self.__jsonObject__['nodeinfo']['network']['addresses']:
|
||||
if not address.startswith('fe80'):
|
||||
addresses.append(address)
|
||||
except:
|
||||
pass
|
||||
return addresses
|
||||
|
||||
def __getSiteCode__(self):
|
||||
try:
|
||||
return self.__jsonObject__['nodeinfo']['system']['site_code']
|
||||
except:
|
||||
return None
|
||||
93
domain_selector.py
Normal file
93
domain_selector.py
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -
|
||||
#Imports:
|
||||
import json, urllib, os, glob
|
||||
from graph import Graph
|
||||
from hieraException import HieraException
|
||||
|
||||
class DomainSelector:
|
||||
def __init__(self, nodesFile, graphFile, dataPath = './', printStatus = False, targets = None, branch = 'stable'):
|
||||
if not os.path.isdir(dataPath):
|
||||
print "\033[91mError:\033[0m Output folder was not found or is not writable. Given path:", dataPath
|
||||
raise HieraException
|
||||
|
||||
self.printStatus = printStatus
|
||||
self.targets = targets
|
||||
self.dataPath = dataPath.rstrip('/')
|
||||
self.nodesData = self.__getFile__(nodesFile)
|
||||
self.graphData = self.__getFile__(graphFile)
|
||||
|
||||
self.__prepareOutDir__()
|
||||
|
||||
self.graph = Graph(self.nodesData, self.graphData)
|
||||
if self.targets == None:
|
||||
self.writeConfigFiles(self.graph.nodes_list,"all")
|
||||
self.writeDumpFile(self.graph.nodes_list,"all")
|
||||
else:
|
||||
nodes = {}
|
||||
for k,v in self.targets.iteritems():
|
||||
nodes = self.graph.getNodeCloudsIn(v,branch)
|
||||
self.writeConfigFiles(nodes,k)
|
||||
self.writeDumpFile(nodes,k)
|
||||
nodes = {}
|
||||
self.writeConfigFiles(self.graph.getProblemNodes(noAutoupdater = True),"no_autoupdater")
|
||||
self.writeConfigFiles(self.graph.getProblemNodes(noGeodata = True),"no_geo")
|
||||
self.writeConfigFiles(self.graph.getProblemNodes(noGeodata = True, noAutoupdater = True),"no_nothing")
|
||||
|
||||
def __prepareOutDir__(self):
|
||||
files = glob.glob(self.dataPath+'/*')
|
||||
for f in files:
|
||||
os.remove(f)
|
||||
|
||||
def __getFile__(self, nodesFile):
|
||||
if nodesFile.startswith('https://') or nodesFile.startswith('http://'):
|
||||
if self.printStatus:
|
||||
print 'Download', nodesFile.rsplit('/', 1)[1] , 'from URL:', nodesFile
|
||||
resource = urllib.urlopen(nodesFile)
|
||||
else:
|
||||
if self.printStatus:
|
||||
print 'Open', nodesFile.rsplit('/', 1)[1] , 'from file:', nodesFile
|
||||
resource = open(nodesFile)
|
||||
try:
|
||||
data = json.loads(resource.read())
|
||||
except:
|
||||
print "\033[91mError:\033[0m Error while parsing a json file (perhapes misformed file): ", nodesFile
|
||||
raise HieraException
|
||||
finally:
|
||||
resource.close()
|
||||
|
||||
return data
|
||||
|
||||
def writeConfigFiles(self, nodes, name):
|
||||
maxDepth = self.maxDepth(nodes)
|
||||
if len(nodes) > 0:
|
||||
for i in range(0,maxDepth):
|
||||
content = 'geo $switch {\n default 0;'
|
||||
f = open(self.dataPath.rstrip('/')+'/'+name+'_node_level'+str(i),'w')
|
||||
for node in nodes.itervalues():
|
||||
if node.stepsToVpn == i:
|
||||
if node.ipv6 and node.hostname:
|
||||
content += '\n '+node.ipv6+' 1; #'+node.hostname
|
||||
content += '\n}'
|
||||
f.write(content.encode('utf8'))
|
||||
f.close()
|
||||
|
||||
def writeDumpFile(self, nodes, name):
|
||||
content = {}
|
||||
for node in nodes.itervalues():
|
||||
if node.ipv6 and node.hostname:
|
||||
content[node.nodeid] = {
|
||||
'nodeid' : node.nodeid,
|
||||
'ipv6' : node.ipv6,
|
||||
'hostname' : node.hostname,
|
||||
'level' : node.stepsToVpn,
|
||||
}
|
||||
with open(self.dataPath+'/'+name+'_node_statistics.json', 'w') as outfile:
|
||||
json.dump(content, outfile)
|
||||
|
||||
def maxDepth(self, nodes):
|
||||
maxDepth = 0
|
||||
for v in nodes.itervalues():
|
||||
if v.stepsToVpn > maxDepth:
|
||||
maxDepth = v.stepsToVpn
|
||||
return maxDepth+1
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
class HieraException(Exception):
|
||||
def __init__(self, message = ''):
|
||||
super().__init__(message)
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
class Filter(object):
|
||||
def __init__(self, args):
|
||||
self.__args__ = args
|
||||
self.__filters__ = self.__getFilters()
|
||||
|
||||
def filterLocalGraphs(self, domain, localGraphs):
|
||||
filteredGraphs = []
|
||||
for localGraph in localGraphs:
|
||||
if localGraph.isAutoupdaterEnabledOnAllNodes() == False:
|
||||
continue
|
||||
if self.__allowCloudsWithLanLinks__() == False and len(localGraph.getLanLinksInCloud()) > 0:
|
||||
continue
|
||||
filteredGraphs.append(localGraph)
|
||||
return filteredGraphs
|
||||
|
||||
def __allowCloudsWithLanLinks__(self):
|
||||
if 'exclude_clouds_with_lan_links' in self.__filters__ or 'no_lan' in self.__filters__:
|
||||
return False
|
||||
return True
|
||||
|
||||
def __getFilters(self):
|
||||
return [] if self.__args__.filters == None else self.__args__.filters
|
||||
|
||||
def filterNodes(self, domain, nodes):
|
||||
filteredNodes = []
|
||||
for node in nodes:
|
||||
if 'domain_transitions_only' in self.__filters__:
|
||||
try:
|
||||
if domain.name == node.domName:
|
||||
continue
|
||||
except:
|
||||
pass
|
||||
filteredNodes.append(node)
|
||||
return filteredNodes
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
from exceptions.HieraException import HieraException
|
||||
from generator.Filter import Filter
|
||||
from collections import OrderedDict
|
||||
|
||||
class NginxConfGen(object):
|
||||
def __init__(self, domains, args):
|
||||
self.__domains__ = domains
|
||||
self.__args__ = args
|
||||
self.__filter__ = Filter(self.__args__)
|
||||
self.__generatedDomains__ = self.__genDomains__()
|
||||
|
||||
def __genDomains__(self):
|
||||
domains = {}
|
||||
for k,v in self.__domains__.items():
|
||||
domains[k] = self.__genDomain__(v)
|
||||
return domains
|
||||
|
||||
def __genDomain__(self, domain):
|
||||
nodes = {}
|
||||
for localGraph in self.__filter__.filterLocalGraphs(domain, domain.localGraphs):
|
||||
try:
|
||||
for node in self.__filter__.filterNodes(domain, localGraph.getNodesWithNoDependencies()):
|
||||
nodes[node.nodeID] = {
|
||||
'hostname' : node.hostname,
|
||||
'ipv6_addresses' : node.publicIPv6Addresses
|
||||
}
|
||||
except HieraException:
|
||||
print('Was not able to add local cloud, because no VPN link was found.')
|
||||
|
||||
return nodes
|
||||
|
||||
def writeNginxConfigFile(self):
|
||||
f = open(self.__args__.out_file,'w')
|
||||
f.write(self.__genNginxConfigFileContent__())
|
||||
f.close()
|
||||
print('Nginx configfile has been created. You can find it at:', self.__args__.out_file)
|
||||
|
||||
def __genNginxConfigFileContent__(self):
|
||||
content = ''
|
||||
for k, v in OrderedDict(sorted(self.__generatedDomains__.items())).items():
|
||||
content += 'geo $' + k + ' {\n default 0;'
|
||||
for ksub, vsub in OrderedDict(sorted(v.items())).items():
|
||||
for address in vsub['ipv6_addresses']:
|
||||
content += '\n ' + address + ' 1; #' + vsub['hostname']
|
||||
content += '\n}\n'
|
||||
return content
|
||||
|
||||
1
geo-cache/config.json
Normal file
1
geo-cache/config.json
Normal file
|
|
@ -0,0 +1 @@
|
|||
{"autocommit": false, "serializer_class": "json", "store_class": "transactional", "index_class": "transactional", "indexes": {"geoassign": {"pk": {"id": "d15c07cca25f456db849dd578d35dd21", "key": "pk"}}}, "index_store_class": "basic", "version": "0.2.12"}
|
||||
Binary file not shown.
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.879690999999994, "pk": "36b4de270e7911e6891700249b12ccb6", "lon": 8.159523, "payload": {"town": "Oelde", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "40", "country": "Deutschland", "hotel": "Hartmann", "county": "Kreis Warendorf", "state": "Nordrhein-Westfalen", "postcode": "59302", "country_code": "de", "road": "Hauptstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.97225, "pk": "4569961c0e7611e6891700249b12ccb6", "lon": 7.61033, "payload": {"city": "M\u00fcnster", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "23", "country": "Deutschland", "county": "M\u00fcnster", "suburb": "Innenstadtring", "state": "Nordrhein-Westfalen", "city_district": "M\u00fcnster-Mitte", "neighbourhood": "Neutor", "country_code": "de", "road": "Gasselstiege", "postcode": "48159"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.212958, "pk": "dc7da6380e7b11e6891700249b12ccb6", "lon": 7.319042, "payload": {"state_district": "Regierungsbezirk M\u00fcnster", "country": "Deutschland", "cycleway": "Bahntrassenradweg Ochtrup -Rheine", "county": "Kreis Steinfurt", "state": "Nordrhein-Westfalen", "postcode": "48493", "country_code": "de", "village": "Wettringen", "doityourself": "Menzel"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.950806, "pk": "55b5b1ad0e7311e6891700249b12ccb6", "lon": 7.99405, "payload": {"town": "Warendorf", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "33", "country": "Deutschland", "county": "Kreis Warendorf", "state": "Nordrhein-Westfalen", "postcode": "48231", "country_code": "de", "road": "Oststra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.208659999999995, "pk": "6ac21d700e7211e6891700249b12ccb6", "lon": 7.188439999999999, "payload": {"town": "Ochtrup", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "26", "country": "Deutschland", "pub": "Alt Ochtrup", "county": "Kreis Steinfurt", "pedestrian": "Weinerstra\u00dfe", "state": "Nordrhein-Westfalen", "postcode": "48607", "country_code": "de"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.94427, "pk": "1da85a6c0e7311e6891700249b12ccb6", "lon": 6.864500000000022, "payload": {"state_district": "Regierungsbezirk M\u00fcnster", "house_number": "17", "residential": "S\u00fcdlohn", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "46354", "country_code": "de", "village": "S\u00fcdlohn", "country": "Deutschland", "road": "Kirchstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.9433633, "pk": "23b753af238611e685a000249b12ccb6", "lon": 7.609681299999999, "payload": {"city": "M\u00fcnster", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "14", "country": "Deutschland", "county": "M\u00fcnster", "suburb": "Mitte-S\u00fcd", "state": "Nordrhein-Westfalen", "city_district": "M\u00fcnster-Mitte", "neighbourhood": "Aaseestadt", "country_code": "de", "road": "Julius-Leber-Stra\u00dfe", "postcode": "48151"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.827332, "pk": "c3c0098121fc11e6bb6600249b12ccb6", "lon": 8.143103, "payload": {"town": "Oelde", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "15", "country": "Deutschland", "county": "Kreis Warendorf", "suburb": "Keitlinghausen", "state": "Nordrhein-Westfalen", "postcode": "59302", "country_code": "de", "road": "Bahnhofstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.77065, "pk": "89befef90e7411e6891700249b12ccb6", "lon": 7.44655, "payload": {"building": "Raesfeldhaus", "town": "L\u00fcdinghausen", "state_district": "Regierungsbezirk M\u00fcnster", "country": "Deutschland", "cycleway": "Felizitasstiege", "county": "Kreis Coesfeld", "state": "Nordrhein-Westfalen", "postcode": "59348", "country_code": "de"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.9282814, "pk": "260d626a0e7311e6891700249b12ccb6", "lon": 7.5720709, "payload": {"city": "M\u00fcnster", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "65", "country": "Deutschland", "county": "M\u00fcnster", "suburb": "Mecklenbeck", "state": "Nordrhein-Westfalen", "city_district": "M\u00fcnster-West", "postcode": "48163", "country_code": "de", "road": "Meckmannweg"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.030577, "pk": "dd813cc00e7b11e6891700249b12ccb6", "lon": 7.099345, "payload": {"state_district": "Regierungsbezirk M\u00fcnster", "house_number": "6", "residential": "Legden", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48739", "country_code": "de", "village": "Legden", "country": "Deutschland", "road": "Ahauser Stra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.970617, "pk": "ada2d4480e7911e6891700249b12ccb6", "lon": 7.79149, "payload": {"town": "Telgte", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "15", "country": "Deutschland", "county": "Kreis Warendorf", "state": "Nordrhein-Westfalen", "postcode": "48291", "country_code": "de", "road": "Hegelstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.993125618012, "pk": "2e0db1a20e7a11e6891700249b12ccb6", "lon": 7.5475859642029, "payload": {"city": "M\u00fcnster", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "143", "country": "Deutschland", "county": "M\u00fcnster", "suburb": "Nienberge", "state": "Nordrhein-Westfalen", "city_district": "M\u00fcnster-West", "postcode": "48161", "country_code": "de", "administrative": "Isolde-Kurz-Stra\u00dfe", "road": "Isolde-Kurz-Stra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.9505, "pk": "cfd908120e7311e6891700249b12ccb6", "lon": 7.988442, "payload": {"town": "Warendorf", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "33", "country": "Deutschland", "county": "Kreis Warendorf", "state": "Nordrhein-Westfalen", "postcode": "48231", "country_code": "de", "road": "Freckenhorster Stra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.9853747, "pk": "933792400e7b11e6891700249b12ccb6", "lon": 6.967795, "payload": {"town": "Stadtlohn", "state_district": "Regierungsbezirk M\u00fcnster", "country": "Deutschland", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48703", "country_code": "de", "road": "Estern"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.801709, "pk": "e61659db0e7411e6891700249b12ccb6", "lon": 8.203424, "payload": {"town": "Oelde", "state_district": "Regierungsbezirk M\u00fcnster", "country": "Deutschland", "county": "Kreis Warendorf", "suburb": "Stromberg", "state": "Nordrhein-Westfalen", "postcode": "59302", "country_code": "de", "road": "M\u00fcnsterstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.920545000000004, "pk": "66a577280e7211e6891700249b12ccb6", "lon": 8.401523, "payload": {"town": "G\u00fctersloh", "state_district": "Regierungsbezirk Detmold", "house_number": "21", "country": "Deutschland", "county": "Kreis G\u00fctersloh", "suburb": "Isselhorst", "state": "Nordrhein-Westfalen", "postcode": "33334", "country_code": "de", "road": "H\u00fclsbrockstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.146905, "pk": "519a87f40e7911e6891700249b12ccb6", "lon": 7.337345, "payload": {"town": "Steinfurt", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "39", "country": "Deutschland", "county": "Kreis Steinfurt", "suburb": "Burgsteinfurt", "state": "Nordrhein-Westfalen", "postcode": "48565", "country_code": "de", "road": "T\u00fcrkei"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.76257, "pk": "812a55240e7611e6891700249b12ccb6", "lon": 7.39421, "payload": {"town": "L\u00fcdinghausen", "state_district": "Regierungsbezirk M\u00fcnster", "country": "Deutschland", "county": "Kreis Coesfeld", "state": "Nordrhein-Westfalen", "road": "Halterner Stra\u00dfe", "country_code": "de", "bank": "Volksbank", "postcode": "59348"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.02203, "pk": "037b02ec0e7911e6891700249b12ccb6", "lon": 7.779535000000001, "payload": {"town": "Telgte", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "2", "country": "Deutschland", "county": "Kreis Warendorf", "state": "Nordrhein-Westfalen", "road": "Im L\u00fctken Esch", "country_code": "de", "bank": "Sparkasse", "postcode": "48291"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.8472704, "pk": "b846de8b0e7411e6891700249b12ccb6", "lon": 6.6238827, "payload": {"town": "Bocholt", "state_district": "Regierungsbezirk M\u00fcnster", "country": "Deutschland", "bakery": "Gildhuis BackDrive", "county": "Kreis Borken", "suburb": "Stenern", "state": "Nordrhein-Westfalen", "postcode": "46397", "country_code": "de", "road": "Borgersstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.951749, "pk": "25f9cdf90e7911e6891700249b12ccb6", "lon": 7.989143, "payload": {"town": "Warendorf", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "5", "country": "Deutschland", "county": "Kreis Warendorf", "pedestrian": "Freckenhorster Stra\u00dfe", "state": "Nordrhein-Westfalen", "postcode": "48231", "country_code": "de"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.700884, "pk": "c58e5b3721fc11e6bb6600249b12ccb6", "lon": 7.469053, "payload": {"town": "Selm", "state_district": "Regierungsbezirk Arnsberg", "house_number": "1a", "country": "Deutschland", "county": "Kreis Unna", "state": "Nordrhein-Westfalen", "postcode": "59379", "country_code": "de", "road": "S\u00fcdkirchener Stra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.791095, "pk": "fc0fa6600e7411e6891700249b12ccb6", "lon": 7.621274, "payload": {"town": "Ascheberg", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "11", "country": "Deutschland", "county": "Kreis Coesfeld", "state": "Nordrhein-Westfalen", "postcode": "59387", "country_code": "de", "road": "Bultenstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.85134926505, "pk": "31f974770e7b11e6891700249b12ccb6", "lon": 6.647362858057, "payload": {"town": "Bocholt", "state_district": "Regierungsbezirk M\u00fcnster", "restaurant": "Ribhouse Texas", "house_number": "10", "country": "Deutschland", "county": "Kreis Borken", "suburb": "Stenern", "state": "Nordrhein-Westfalen", "postcode": "46397", "country_code": "de", "road": "Wiener Allee"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.835307, "pk": "79233af60e7811e6891700249b12ccb6", "lon": 8.033406, "payload": {"town": "Ennigerloh", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "7", "country": "Deutschland", "county": "Kreis Warendorf", "state": "Nordrhein-Westfalen", "postcode": "59320", "country_code": "de", "road": "Agnesstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.147601, "pk": "96f417e40e7811e6891700249b12ccb6", "lon": 7.33618, "payload": {"town": "Steinfurt", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "1", "country": "Deutschland", "county": "Kreis Steinfurt", "suburb": "Burgsteinfurt", "state": "Nordrhein-Westfalen", "postcode": "48565", "country_code": "de", "road": "Wilhelmsplatz"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.740391, "pk": "cb48a7c40e7511e6891700249b12ccb6", "lon": 7.66152, "payload": {"town": "Ascheberg", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "7", "country": "Deutschland", "county": "Kreis Coesfeld", "suburb": "Herbern", "state": "Nordrhein-Westfalen", "postcode": "59387", "country_code": "de", "road": "S\u00fcdstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.950706, "pk": "0f6ad21f0e7711e6891700249b12ccb6", "lon": 7.005000999999999, "payload": {"town": "Gescher", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "10", "country": "Deutschland", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48712", "country_code": "de", "road": "Prozessionsweg"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.992187, "pk": "9fe23b2c0e7a11e6891700249b12ccb6", "lon": 6.917652, "payload": {"town": "Stadtlohn", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "1", "residential": "Stadtlohn", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48703", "country_code": "de", "country": "Deutschland", "road": "Stegerstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.837171358860644, "pk": "981e8ecb0e7211e6891700249b12ccb6", "lon": 6.615085154771805, "payload": {"town": "Bocholt", "state_district": "Regierungsbezirk M\u00fcnster", "pedestrian": "Neustra\u00dfe", "house_number": "24", "country": "Deutschland", "county": "Kreis Borken", "suburb": "Stenern", "state": "Nordrhein-Westfalen", "postcode": "46399", "country_code": "de"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.885716, "pk": "7d267bb80e7311e6891700249b12ccb6", "lon": 6.661954, "payload": {"town": "Bocholt", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "86a", "country": "Deutschland", "county": "Kreis Borken", "suburb": "Barlo", "state": "Nordrhein-Westfalen", "postcode": "46399", "country_code": "de", "road": "Winterswijker Stra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.206768, "pk": "5a5f05f821fd11e6bb6600249b12ccb6", "lon": 7.309878, "payload": {"state_district": "Regierungsbezirk M\u00fcnster", "house_number": "3", "country": "Deutschland", "county": "Kreis Steinfurt", "state": "Nordrhein-Westfalen", "postcode": "48493", "country_code": "de", "village": "Wettringen", "road": "L\u00fckenbleiche"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.244512, "pk": "ae0705810e7411e6891700249b12ccb6", "lon": 7.371498, "payload": {"town": "Neuenkirchen", "state_district": "Regierungsbezirk M\u00fcnster", "pedestrian": "Marktstra\u00dfe", "country": "Deutschland", "county": "Kreis Steinfurt", "suburb": "Sankt Arnold", "state": "Nordrhein-Westfalen", "postcode": "48485", "country_code": "de", "bank": "Sparkasse"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.99323, "pk": "7c9a58730e7811e6891700249b12ccb6", "lon": 7.54196, "payload": {"city": "M\u00fcnster", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "14", "country": "Deutschland", "county": "M\u00fcnster", "suburb": "Nienberge", "state": "Nordrhein-Westfalen", "city_district": "M\u00fcnster-West", "postcode": "48161", "country_code": "de", "administrative": "Von-Schonebeck-Ring", "road": "K\u00e4the-Ernst-Weg"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.022107, "pk": "2ff5346f0e7411e6891700249b12ccb6", "lon": 7.77959, "payload": {"town": "Telgte", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "2", "country": "Deutschland", "county": "Kreis Warendorf", "state": "Nordrhein-Westfalen", "road": "Im L\u00fctken Esch", "country_code": "de", "bank": "Sparkasse", "postcode": "48291"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.71792285721072, "pk": "c80e231e21fc11e6bb6600249b12ccb6", "lon": 8.77033531665802, "payload": {"city": "Paderborn", "state_district": "Regierungsbezirk Detmold", "house_number": "24", "country": "Deutschland", "county": "Kreis Paderborn", "suburb": "Paderborn", "state": "Nordrhein-Westfalen", "postcode": "33100", "country_code": "de", "road": "Driburger Stra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.093169, "pk": "c73006080e7211e6891700249b12ccb6", "lon": 7.619388000000002, "payload": {"town": "Greven", "state_district": "Regierungsbezirk M\u00fcnster", "country": "Deutschland", "county": "Kreis Steinfurt", "suburb": "Gimbte", "state": "Nordrhein-Westfalen", "postcode": "48268", "country_code": "de", "fuel": "Esso", "road": "K\u00f6nigstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.040741, "pk": "4ab5d7540e7911e6891700249b12ccb6", "lon": 7.471882000000001, "payload": {"state_district": "Regierungsbezirk M\u00fcnster", "country": "Deutschland", "village": "Altenberge", "cycleway": "Kr\u00fcselstra\u00dfe", "county": "Kreis Steinfurt", "state": "Nordrhein-Westfalen", "postcode": "48341", "country_code": "de", "parking": "Dursty"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.891543, "pk": "2ed9363c0e7611e6891700249b12ccb6", "lon": 6.9878399999999985, "payload": {"town": "Velen", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "48,50", "country": "Deutschland", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "46342", "country_code": "de", "road": "Rekener Stra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.228189, "pk": "64c07fa10e7411e6891700249b12ccb6", "lon": 7.488972, "payload": {"town": "Rheine", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "4", "house": "Gisela Wilp - Schreibwaren & B\u00fcrobedarf", "county": "Kreis Steinfurt", "suburb": "Gellendorf", "state": "Nordrhein-Westfalen", "postcode": "48432", "country_code": "de", "country": "Deutschland", "road": "Gr\u00f6ningstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.83373600000001, "pk": "27877df80e7b11e6891700249b12ccb6", "lon": 6.598282000000001, "payload": {"town": "Bocholt", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "17", "country": "Deutschland", "county": "Kreis Borken", "suburb": "Lowick", "state": "Nordrhein-Westfalen", "postcode": "46395", "country_code": "de", "road": "Isselburger Stra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.9888562, "pk": "92d757e40e7711e6891700249b12ccb6", "lon": 8.048106, "payload": {"building": "VFL Sassenberg", "town": "Sassenberg", "state_district": "Regierungsbezirk M\u00fcnster", "country": "Deutschland", "county": "Kreis Warendorf", "state": "Nordrhein-Westfalen", "postcode": "48336", "country_code": "de", "road": "Telgenkamp"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.08827, "pk": "b54422020e7311e6891700249b12ccb6", "lon": 7.245107, "payload": {"state_district": "Regierungsbezirk M\u00fcnster", "country": "Deutschland", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48624", "country_code": "de", "village": "Sch\u00f6ppingen", "car_repair": "T & H", "road": "K 36"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.972377, "pk": "5c83666f0e7811e6891700249b12ccb6", "lon": 6.890413, "payload": {"town": "Stadtlohn", "state_district": "Regierungsbezirk M\u00fcnster", "country": "Deutschland", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48703", "country_code": "de", "road": "Hundewick"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.773205, "pk": "d4be109c0e7911e6891700249b12ccb6", "lon": 7.4503493, "payload": {"town": "L\u00fcdinghausen", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "28", "country": "Deutschland", "county": "Kreis Coesfeld", "state": "Nordrhein-Westfalen", "postcode": "59348", "country_code": "de", "road": "Geschwister-Scholl-Stra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.993312, "pk": "581841320e7b11e6891700249b12ccb6", "lon": 6.892798, "payload": {"town": "Stadtlohn", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "9", "residential": "Stadtlohn", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48703", "country_code": "de", "country": "Deutschland", "road": "Gerhart-Hauptmann-Stra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.57263, "pk": "049fbc380e7b11e6891700249b12ccb6", "lon": 7.38275, "payload": {"city": "Dortmund", "state_district": "Regierungsbezirk Arnsberg", "house_number": "710", "country": "Deutschland", "county": "Dortmund", "suburb": "Mengede", "state": "Nordrhein-Westfalen", "postcode": "44359", "country_code": "de", "road": "Mengeder Stra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.07824, "pk": "2ea9c2620e7b11e6891700249b12ccb6", "lon": 8.00745, "payload": {"house_number": "6", "country": "Deutschland", "county": "Landkreis Osnabr\u00fcck", "state": "Niedersachsen", "postcode": "49219", "country_code": "de", "village": "Glandorf", "road": "F\u00e4rberstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.9504597, "pk": "7daeb3960e7511e6891700249b12ccb6", "lon": 7.0043497, "payload": {"town": "Gescher", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "6", "country": "Deutschland", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48712", "country_code": "de", "road": "Prozessionsweg"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.94435746866206, "pk": "798613890e7311e6891700249b12ccb6", "lon": 7.979732751846313, "payload": {"town": "Warendorf", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "38", "country": "Deutschland", "county": "Kreis Warendorf", "state": "Nordrhein-Westfalen", "postcode": "48231", "country_code": "de", "road": "Breslauer Stra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.831965, "pk": "fbe8d84c0e7311e6891700249b12ccb6", "lon": 7.044387, "payload": {"town": "Reken", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "13", "residential": "Gross Reken", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48734", "country_code": "de", "country": "Deutschland", "road": "Hauptstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.743596999999994, "pk": "9fbd4dc90e7811e6891700249b12ccb6", "lon": 7.475477, "payload": {"town": "L\u00fcdinghausen", "state_district": "Regierungsbezirk M\u00fcnster", "address29": "Am Hellerkamp", "house_number": "46", "country": "Deutschland", "county": "Kreis Coesfeld", "state": "Nordrhein-Westfalen", "postcode": "59348", "country_code": "de", "road": "Ermen"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.98238, "pk": "040fa2c20e7311e6891700249b12ccb6", "lon": 7.6172, "payload": {"city": "M\u00fcnster", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "56", "country": "Deutschland", "county": "M\u00fcnster", "suburb": "Mitte-Nordost", "state": "Nordrhein-Westfalen", "city_district": "M\u00fcnster-Mitte", "neighbourhood": "Uppenberg", "country_code": "de", "road": "Salzmannstra\u00dfe", "postcode": "48147"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.942976, "pk": "3f3613bf0e7211e6891700249b12ccb6", "lon": 7.6141070000000015, "payload": {"city": "M\u00fcnster", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "4", "country": "Deutschland", "county": "M\u00fcnster", "suburb": "Mitte-S\u00fcd", "state": "Nordrhein-Westfalen", "city_district": "M\u00fcnster-Mitte", "neighbourhood": "Geist", "country_code": "de", "road": "Gr\u00fcner Grund", "postcode": "48151"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.96165, "pk": "a54e87990e7811e6891700249b12ccb6", "lon": 7.631359999999972, "payload": {"city": "M\u00fcnster", "state_district": "Regierungsbezirk M\u00fcnster", "pedestrian": "Salzstra\u00dfe", "house_number": "16", "country": "Deutschland", "county": "M\u00fcnster", "suburb": "Altstadt", "state": "Nordrhein-Westfalen", "city_district": "M\u00fcnster-Mitte", "postcode": "48143", "country_code": "de", "neighbourhood": "Dom"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.89904200000001, "pk": "1c78140a0e7511e6891700249b12ccb6", "lon": 7.425224000000001, "payload": {"town": "Nottuln", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "15", "country": "Deutschland", "county": "Kreis Coesfeld", "state": "Nordrhein-Westfalen", "postcode": "48301", "country_code": "de", "road": "M\u00fcnsterstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.946139, "pk": "1441712921fd11e6bb6600249b12ccb6", "lon": 7.169010000000001, "payload": {"town": "Coesfeld", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "5", "country": "Deutschland", "county": "Kreis Coesfeld", "suburb": "Goxel", "state": "Nordrhein-Westfalen", "road": "M\u00fcnsterstra\u00dfe", "country_code": "de", "bank": "Sparkasse Westm\u00fcnsterland", "postcode": "48653"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.837353, "pk": "c736ce3c21fc11e6bb6600249b12ccb6", "lon": 7.053166, "payload": {"town": "Reken", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "17", "residential": "Gross Reken", "county": "Kreis Borken", "suburb": "Maria Veen", "state": "Nordrhein-Westfalen", "postcode": "48734", "country_code": "de", "country": "Deutschland", "road": "Werenzostra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.94861999999999, "pk": "2c1bcd160e7511e6891700249b12ccb6", "lon": 7.001675, "payload": {"town": "Gescher", "state_district": "Regierungsbezirk M\u00fcnster", "address29": "DHL", "country": "Deutschland", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48712", "country_code": "de", "road": "Schultenrott"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.98926999999999, "pk": "ba1f99d60e7411e6891700249b12ccb6", "lon": 6.93303, "payload": {"town": "Stadtlohn", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "40", "residential": "Stadtlohn", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48703", "country_code": "de", "country": "Deutschland", "road": "Elisabethstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.75722, "pk": "f4f5085f0e7211e6891700249b12ccb6", "lon": 7.382460000000001, "payload": {"town": "L\u00fcdinghausen", "state_district": "Regierungsbezirk M\u00fcnster", "country": "Deutschland", "county": "Kreis Coesfeld", "state": "Nordrhein-Westfalen", "postcode": "59348", "country_code": "de", "road": "Reckelsum"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.828596, "pk": "ab2606440e7511e6891700249b12ccb6", "lon": 7.276064, "payload": {"town": "D\u00fclmen", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "7", "country": "Deutschland", "county": "Kreis Coesfeld", "suburb": "Mitte", "state": "Nordrhein-Westfalen", "postcode": "48249", "country_code": "de", "road": "K\u00f6tter\u00f6de"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.950251, "pk": "8d202e520e7711e6891700249b12ccb6", "lon": 7.994008999999998, "payload": {"town": "Warendorf", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "50b", "country": "Deutschland", "county": "Kreis Warendorf", "state": "Nordrhein-Westfalen", "postcode": "48231", "country_code": "de", "road": "Oststra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.9410769, "pk": "631987330e7411e6891700249b12ccb6", "lon": 7.0304737, "payload": {"building": "Sprung", "town": "Gescher", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "22", "country": "Deutschland", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48712", "country_code": "de", "road": "Schuckertstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.86895, "pk": "4c25b26b0e7b11e6891700249b12ccb6", "lon": 7.73665, "payload": {"town": "Sendenhorst", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "21", "country": "Deutschland", "hotel": "Hotel Restaurant Geschermann", "county": "Kreis Warendorf", "state": "Nordrhein-Westfalen", "postcode": "48324", "country_code": "de", "road": "Bahnhofstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.9542154, "pk": "19da56d60e7511e6891700249b12ccb6", "lon": 6.998559300000012, "payload": {"town": "Gescher", "state_district": "Regierungsbezirk M\u00fcnster", "country": "Deutschland", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48712", "country_code": "de", "doctors": "Bertram W. Kai Dr. u. Hohner Stephan Dr.", "road": "Hofstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.9492753, "pk": "a49e88dc0e7a11e6891700249b12ccb6", "lon": 7.162062599999999, "payload": {"town": "Coesfeld", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "7", "country": "Deutschland", "county": "Kreis Coesfeld", "suburb": "Goxel", "state": "Nordrhein-Westfalen", "postcode": "48653", "country_code": "de", "road": "Buningweg"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.843828, "pk": "644d04480e7a11e6891700249b12ccb6", "lon": 7.826749, "payload": {"town": "Sendenhorst", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "5", "country": "Deutschland", "county": "Kreis Warendorf", "state": "Nordrhein-Westfalen", "postcode": "48324", "country_code": "de", "road": "Weststra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.047206, "pk": "d10e1d660e7411e6891700249b12ccb6", "lon": 7.350857, "payload": {"state_district": "Regierungsbezirk M\u00fcnster", "house_number": "2", "country": "Deutschland", "county": "Kreis Steinfurt", "state": "Nordrhein-Westfalen", "postcode": "48366", "country_code": "de", "village": "Laer", "road": "Amtmann-von-Oy-Stra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.96465974183005, "pk": "c4b148bb0e7211e6891700249b12ccb6", "lon": 7.609834671020508, "payload": {"city": "M\u00fcnster", "state_district": "Regierungsbezirk M\u00fcnster", "address29": "Schlossgarten", "country": "Deutschland", "county": "M\u00fcnster", "suburb": "Innenstadtring", "state": "Nordrhein-Westfalen", "city_district": "M\u00fcnster-Mitte", "neighbourhood": "Schloss", "country_code": "de", "road": "Schlossgarten", "postcode": "48149"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.025766, "pk": "9f205c430e7411e6891700249b12ccb6", "lon": 7.772939, "payload": {"town": "Telgte", "state_district": "Regierungsbezirk M\u00fcnster", "country": "Deutschland", "county": "Kreis Warendorf", "state": "Nordrhein-Westfalen", "postcode": "48291", "country_code": "de", "road": "Dieckhoffskamp"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.90431, "pk": "c48d5c7f0e7311e6891700249b12ccb6", "lon": 7.64702, "payload": {"city": "M\u00fcnster", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "62", "country": "Deutschland", "county": "M\u00fcnster", "suburb": "Hiltrup", "state": "Nordrhein-Westfalen", "city_district": "M\u00fcnster-Hiltrup", "neighbourhood": "Hiltrup-West", "country_code": "de", "road": "Marktallee", "postcode": "48165"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.99684, "pk": "78eaa6240e7711e6891700249b12ccb6", "lon": 6.92935, "payload": {"town": "Stadtlohn", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "65b", "residential": "Stadtlohn", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48703", "country_code": "de", "country": "Deutschland", "road": "Kalterweg"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.99185, "pk": "f9cce4680e7811e6891700249b12ccb6", "lon": 6.911165, "payload": {"town": "Stadtlohn", "state_district": "Regierungsbezirk M\u00fcnster", "residential": "Stadtlohn", "pub": "Lobbe", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48703", "country_code": "de", "country": "Deutschland", "road": "Josefstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.128424, "pk": "69caa3c00e7b11e6891700249b12ccb6", "lon": 7.394462, "payload": {"town": "Steinfurt", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "40", "country": "Deutschland", "county": "Kreis Steinfurt", "suburb": "Borghorst", "state": "Nordrhein-Westfalen", "postcode": "48565", "country_code": "de", "road": "Emsdettener Stra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.928607, "pk": "9835310121fc11e6bb6600249b12ccb6", "lon": 7.572221000000001, "payload": {"city": "M\u00fcnster", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "41", "country": "Deutschland", "hotel": "Pension Haselmann", "county": "M\u00fcnster", "suburb": "Mecklenbeck", "state": "Nordrhein-Westfalen", "city_district": "M\u00fcnster-West", "postcode": "48163", "country_code": "de", "road": "Fla\u00dfkamp"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 52.083713, "pk": "3e1b6ae10e7411e6891700249b12ccb6", "lon": 7.479667, "payload": {"state_district": "Regierungsbezirk M\u00fcnster", "house_number": "10", "country": "Deutschland", "county": "Kreis Steinfurt", "state": "Nordrhein-Westfalen", "postcode": "48356", "country_code": "de", "village": "Nordwalde", "road": "Bahnhofstra\u00dfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"lat": 51.95102, "pk": "d54cd6a00e7a11e6891700249b12ccb6", "lon": 6.98929, "payload": {"town": "Gescher", "state_district": "Regierungsbezirk M\u00fcnster", "house_number": "27", "country": "Deutschland", "county": "Kreis Borken", "state": "Nordrhein-Westfalen", "postcode": "48712", "country_code": "de", "road": "B\u00f6nningskamp"}}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue