From: Ian Kelling Date: Thu, 25 Aug 2016 00:37:28 +0000 (-0700) Subject: good working version X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=d0a5b73d2a275bfff5957961f2360df8966bee22;p=iankelling.org good working version No more history because it had lots of files that shouldn't be checked in and it wasn't worth fixing up the history --- d0a5b73d2a275bfff5957961f2360df8966bee22 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9a8f6c5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +/_site/blog +/_site/blog.html +/_site/feed.xml +/_site/music +/proposed-comments +/_site/favorite-stuff.html +/_site/index.html + + +/resume.md +/_site/resume.html diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) 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 +this service 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 make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + 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 +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 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, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision 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, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This 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. diff --git a/COPYING.gplv3 b/COPYING.gplv3 new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/COPYING.gplv3 @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README b/README new file mode 100644 index 0000000..017260f --- /dev/null +++ b/README @@ -0,0 +1,56 @@ +Content and automated setup of iankelling.org + + +* Setup + +setup.sh sets up apache and gitweb +build.rb does static site generation + +Dependencies for running ./setup.sh DOMAIN: A modern debian based system +(tested on debian 8, and debian 8 testing). + +Some shell scripts need to be sourced before running setup.sh: +https://iankelling.org/git/?p=distro-functions;a=summary +And some programs need to be in PATH: +https://iankelling.org/git/?p=basic-https-conf;a=summary +https://sallymae.club/git/?p=acme-tiny-wrapper;a=summary + +This repo does not include the repos under /git. In my own version, under /git are links to the .git dirs of the respective repos under the +hardcoded directory in setup.sh: gitroot=/a/bin/githtml. These +directories are managed separately, mostly by rsyncing them. + +Only the latest version of resume is kept in the resume branch which +gets rebased on master. + +./build.rb does have any dependencies, but it's not a generalized site +generator, it has some content files specific to my site that it expects. + +Dates in the blog directory can be generated with date +%F + + +* Comments + +New comments are stored in a sqlite database. Ones that are not +moderated for spam etc, are stored to disk for checkin on the next run +of build.rb. get-comments, set-comments, and iank-mod.el are for +moderating new comments. With one emacs command, you get a buffer of the +new comments, with keybinds to mark them for publishing, moderatation, +banning, and execute changes. + +* Inspirations + +http://blog.zorinaq.com/release-of-hablog-and-new-design/? +https://mjg59.dreamwidth.org/ +http://bettermotherfuckingwebsite.com +https://eduardoboucas.com/blog/2015/05/11/rethinking-the-commenting-system-for-my-jekyll-site.html + +* License + +Non-software is cc-by-sa 4 unless stated otherwise. Software is under +GPLv2 or later unless stated otherwise. I'd use gplv3 or agpl, but it's +simpler to use the same license as the gitweb javascript. + +The elisp is GPLv3 because emacs is. + +The opensans font is Apache2 licensed, from google fonts, +the license is included in the LICENSE file. diff --git a/_site/assets/OpenSans.ttf b/_site/assets/OpenSans.ttf new file mode 100644 index 0000000..0dae9c3 Binary files /dev/null and b/_site/assets/OpenSans.ttf differ diff --git a/_site/assets/cc-by-sa-4.0-80x15.png b/_site/assets/cc-by-sa-4.0-80x15.png new file mode 100644 index 0000000..c1b97c4 Binary files /dev/null and b/_site/assets/cc-by-sa-4.0-80x15.png differ diff --git a/_site/assets/cc-by-sa.png b/_site/assets/cc-by-sa.png new file mode 100644 index 0000000..5d64b4a Binary files /dev/null and b/_site/assets/cc-by-sa.png differ diff --git a/_site/assets/cc-by-sa.svg b/_site/assets/cc-by-sa.svg new file mode 100644 index 0000000..7288b4d --- /dev/null +++ b/_site/assets/cc-by-sa.svg @@ -0,0 +1,199 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/_site/assets/favicon.png b/_site/assets/favicon.png new file mode 100644 index 0000000..e817ebc Binary files /dev/null and b/_site/assets/favicon.png differ diff --git a/_site/assets/librejs-logo.png b/_site/assets/librejs-logo.png new file mode 100644 index 0000000..0bb6eb2 Binary files /dev/null and b/_site/assets/librejs-logo.png differ diff --git a/_site/assets/profile250.jpg b/_site/assets/profile250.jpg new file mode 100644 index 0000000..d6426ac Binary files /dev/null and b/_site/assets/profile250.jpg differ diff --git a/_site/comment.rb b/_site/comment.rb new file mode 100755 index 0000000..14f1152 --- /dev/null +++ b/_site/comment.rb @@ -0,0 +1,332 @@ +#!/usr/bin/env ruby +# encoding: utf-8 +# Copyright (C) 2016 Ian Kelling + +# 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 2 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 . + +# debian sets LANG=C when starting apache2. +# the envoding comment above fixes the internal encoding afaik, +# Found this at +# https://stackoverflow.com/questions/20521371/set-utf-8-as-default-for-ruby-1-9-3 +# also note man ruby's -E arg. +Encoding.default_external = Encoding::UTF_8 + +require 'cgi' +require 'fileutils' +require 'time' +require 'sqlite3' + +require_relative '../b' +include B + +# constanty things +DEBUG = true +CAPTCHA = -> { + c = [] + x = (< 0 + c << x.pop(2) + end + c +}[] + +def do_captcha + captcha_q = CAPTCHA.sample[0] + puts "Content-type: text/html\n\n" + puts skel('comment.rb', "#{DN}/captcha", <blog / comment-captcha') +

Hello friend. I haven't read a post from #{IP}, and I only remember for a few months, so:

+

#{captcha_q}

+ +
+ + + + +
Your comment: + + +
+EOF + exit 0 +end + + +def fail(msg) + if DEBUG and msg + puts "Content-type: text/plain\n\n" + puts msg + else + redir + end + exit 0 +end + +def redir + File.write('/tmp/x', GOTO) + puts 'Status: 302 Found' + puts "Location: #{GOTO}#comment-section\n\n" + exit(0) +end + + +def bn(*args) + File.basename *args +end + + +###### begin error checking & arg parsing ###### +cgi = CGI.new +IP = cgi.remote_addr + +if cgi.has_key?('goto') + GOTO = cgi['goto'] +else + GOTO = '/' + fail['redir to /'] +end + +if (cgi.has_key?('url') && cgi['url'] != "") || ! cgi.has_key?('comment') + fail["comment not in form or url in form. cgi.params: #{cgi.params}"] +end + +COMMENT_TXT = cgi["comment"] + + +if COMMENT_TXT.length > 1000 or GOTO.length > 150 + fail['length of comment or goto is too great'] +end + + +captchad = false +if cgi.has_key?('answer') && cgi.has_key?('question') + if cgi['answer'].downcase !~ /^#{CAPTCHA.to_h[cgi['question']]}$/ + do_captcha + end + captchad = true +end + + +-> { + found = false + Dir.foreach('blog') do |entry| + next if ['.','..'].any? { |f| f == entry } + if GOTO == 'blog/' + entry + found = true + break + end + end + fail['goto entry not found'] unless found +}[] +######### end error checking & arg parsing ######## + + +$db = db_init +state = nil +WHITELIST_CUTOFF = NOW - 4*DAY + + +####### begin: state for ips we've seen before ####### +[[5, 60], # 1 min + [10, 60*5], # 5 min + [20, 60*60], # 60 min + [30, 60*60*24], # 1 day + [60, 60*60*24*7]] # 1 week + .each do |max_posts, date| + + if $db.execute(<<-SQL, [NOW - date])[0][0] > max_posts + select count(*) from c + where date > ? and ip = '#{IP}' +SQL + state = 'rate_limited' + end +end + +state ||= 'suspect' if $db.execute(<<-SQL)[0][0] > 0 + select count(*) from c + where ip = '#{IP}' and ( +state = 'banned' or +state = 'rate_limited') +SQL + +unless state + older_date = NOW - DAY*2 + last_moderated = $db.execute(<<-SQL, [older_date])[-1][0] + select date from c + where ip = '#{IP}' and ( + state = 'moderated' or + (date < ? and (state = 'timed' or state = 'known'))) +SQL + last_good = $db.execute(<<-SQL, [older_date])[-1][0] + select date from c + where ip = '#{IP}' and ( + state = 'picked' or + (date < ? and (state = 'timed' or state = 'known'))) +SQL + if last_moderated && last_good + if last_good > last_moderated + state = 'known' + else + # these 2 waiting conditions are not actually needed, + # since waiting is the default, but meh. + state = 'waiting' + end + elsif last_moderated + state = 'waiting' + elsif last_good + state = 'known' + end +end +####### end: state for ips we've seen before ####### + +####### begin: whitelist checking ######### +glob = "../blog/#{'?'*'YYYY-MM-DD-'.length}#{bn GOTO, '.*'}.md" +md_file = Dir[glob][0] +unless state + b = bn(md_file,'.*') + post_date = Time.parse(b[0..DATE_LEN]).to_i + if post_date > WHITELIST_CUTOFF + state = 'timed' + end +end +###### end: whitelist checking ######## + +state ||= 'waiting' + +if state != 'known' && ! captchad + do_captcha +end + + +# states: +# timed +# # was posted a whitelist period, so automatically posted. +# # whitelist periods are per page times when legit comments are +# # much more likely than spam, so we automatically let comments through. + +# known +# # ip posted good comment before: either, one in picked state, or +# # a timed/known comment which is over 2 days old (I saw it and didn't remove +# # it) + +# picked +# # manually marked as a good comment, so publish it. + +# rate_limited +# # posting too much, consider them a spammer. + +# moderated +# # bad comment, but don't ban them + +# banned +# # all comments from this ip dead, new comment's dont even go into the db. + +# waiting +# # waiting for manual moderation, get's posted automatically if there +# # is none in 24 hours + +# suspect +# # had a bad post in the past. does not +# # automatically get posted in time without moderation. + + +# any of the manual states +date = $db.execute(<<-SQL)[0][0] +select max(date) from c where +state = 'moderated' or +state = 'banned' or +state = 'picked' +SQL + +# not the bad automatic states +query = <<-SQL +select count(*) from c where +state != 'rate_limited' and +state != 'suspect' +SQL + + +if date + new_count = $db.execute(query + 'and date > ?',date) +else + new_count = $db.execute(query) +end + +if new_count == 1 + require 'net/smtp' + def send_email(opts={}) + opts[:to] ||= ENV['USER'] + opts[:server] ||= 'localhost' + opts[:from] ||= ENV['USER'] + opts[:from_alias] ||= ENV['USER'] + opts[:subject] ||= "test subject" + opts[:body] ||= "" + + msg = < +To: <#{opts[:to]}> +Subject: #{opts[:subject]} + +#{opts[:body]} +END_OF_MESSAGE + + Net::SMTP.start(opts[:server]) do |smtp| + smtp.send_message msg, opts[:from], opts[:to] + end + end + send_email :subject => 'new comments on iankelling.org' +end + +$db.execute('insert into c values (NULL, ?, ?, ?, ?, ?)', + [state, + IP, + NOW, + GOTO, + COMMENT_TXT]) + +post(md_file) + +redir diff --git a/_site/common.css b/_site/common.css new file mode 100644 index 0000000..d0c5e76 --- /dev/null +++ b/_site/common.css @@ -0,0 +1,28 @@ +/* a few other things are duplicated in main.css and gitweb.css,*/ +/* but they are for different classes and such, and it's not worth using*/ +/* css variables etc at this point. */ + +/* nice font seen elsewhere. google -> stackoverflow -> localfont.com */ +/* If I didn't use this font, I'd just go with sans-serif */ +@font-face { + font-family: 'Open Sans'; + font-weight: 400; + font-style: normal; + src: url('/font/Open-Sans-regular/Open-Sans-regular.eot'); + src: url('/font/Open-Sans-regular/Open-Sans-regular.eot?#iefix') format('embedded-opentype'), + local('Open Sans'), + local('Open-Sans-regular'), + url('/font/Open-Sans-regular/Open-Sans-regular.woff2') format('woff2'), + url('/font/Open-Sans-regular/Open-Sans-regular.woff') format('woff'), + url('/font/Open-Sans-regular/Open-Sans-regular.ttf') format('truetype'), + url('/font/Open-Sans-regular/Open-Sans-regular.svg#Open Sans') format('svg'); +} + + +body { + font-family: 'Open Sans',sans-serif; + /* default too bright. use gitweb's color */ + background-color: #d9d8d1; + /* get rid of the small default margin so we can stripe the page */ + margin: 0; +} diff --git a/_site/disabled.css b/_site/disabled.css new file mode 100644 index 0000000..e69de29 diff --git a/_site/font/Open-Sans-regular/LICENSE.txt b/_site/font/Open-Sans-regular/LICENSE.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/_site/font/Open-Sans-regular/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/_site/font/Open-Sans-regular/Open-Sans-regular.eot b/_site/font/Open-Sans-regular/Open-Sans-regular.eot new file mode 100644 index 0000000..1d98e6e Binary files /dev/null and b/_site/font/Open-Sans-regular/Open-Sans-regular.eot differ diff --git a/_site/font/Open-Sans-regular/Open-Sans-regular.svg b/_site/font/Open-Sans-regular/Open-Sans-regular.svg new file mode 100644 index 0000000..052c59f --- /dev/null +++ b/_site/font/Open-Sans-regular/Open-Sans-regular.svg @@ -0,0 +1,1637 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/_site/font/Open-Sans-regular/Open-Sans-regular.ttf b/_site/font/Open-Sans-regular/Open-Sans-regular.ttf new file mode 100644 index 0000000..0dae9c3 Binary files /dev/null and b/_site/font/Open-Sans-regular/Open-Sans-regular.ttf differ diff --git a/_site/font/Open-Sans-regular/Open-Sans-regular.woff b/_site/font/Open-Sans-regular/Open-Sans-regular.woff new file mode 100644 index 0000000..ac2b2c6 Binary files /dev/null and b/_site/font/Open-Sans-regular/Open-Sans-regular.woff differ diff --git a/_site/font/Open-Sans-regular/Open-Sans-regular.woff2 b/_site/font/Open-Sans-regular/Open-Sans-regular.woff2 new file mode 100644 index 0000000..402dfd7 Binary files /dev/null and b/_site/font/Open-Sans-regular/Open-Sans-regular.woff2 differ diff --git a/_site/font/fontello.eot b/_site/font/fontello.eot new file mode 100644 index 0000000..0281033 Binary files /dev/null and b/_site/font/fontello.eot differ diff --git a/_site/font/fontello.svg b/_site/font/fontello.svg new file mode 100644 index 0000000..31aac6a --- /dev/null +++ b/_site/font/fontello.svg @@ -0,0 +1,12 @@ + + + +Copyright (C) 2016 by original authors @ fontello.com + + + + + + + + \ No newline at end of file diff --git a/_site/font/fontello.ttf b/_site/font/fontello.ttf new file mode 100644 index 0000000..c956126 Binary files /dev/null and b/_site/font/fontello.ttf differ diff --git a/_site/font/fontello.woff b/_site/font/fontello.woff new file mode 100644 index 0000000..595a730 Binary files /dev/null and b/_site/font/fontello.woff differ diff --git a/_site/font/fontello.woff2 b/_site/font/fontello.woff2 new file mode 100644 index 0000000..c734698 Binary files /dev/null and b/_site/font/fontello.woff2 differ diff --git a/_site/git b/_site/git new file mode 120000 index 0000000..4dcd84e --- /dev/null +++ b/_site/git @@ -0,0 +1 @@ +/a/bin/githtml/ \ No newline at end of file diff --git a/_site/gitweb-footer.html b/_site/gitweb-footer.html new file mode 100644 index 0000000..a78e415 --- /dev/null +++ b/_site/gitweb-footer.html @@ -0,0 +1,372 @@ + + diff --git a/_site/gitweb-site.css b/_site/gitweb-site.css new file mode 100644 index 0000000..54bb033 --- /dev/null +++ b/_site/gitweb-site.css @@ -0,0 +1,59 @@ + +.main-content-stripe { + /* i don't like bright white. copy a gitweb color */ + background-color: #f6f6f0; + padding: 30px 0; +} + +/* copied from main.css, applied here */ +body { + border-width: 0px; +} +.page_header,.page_footer { + margin: 0 auto; + max-width: 700px; +} + +table.project_list { + /* The main project list just has this one uncentered element,*/ + /* so center it */ + margin: 0 auto; +} +.content { + /* summary pages etc. don't fit nicely in 700px, so just*/ + /* have a 20px margin. */ + margin: 0 20px; +} + +div.page_header { + /* 21.0667 seems to be default for h3 in the non-gitweb site, copy it here */ + margin-top: 21.0667px; + margin-bottom: 21.0667px; + /* remove padding added by gitweb's css */ + padding: 0; +} + +/* I tried to find all the css to override,*/ +/* but found certain things not overriding as I would expect,*/ +/* So hammer it with !important */ +a { + color: #0645ad !important; + text-decoration: none; +} +a:hover { + text-decoration: underline !important; +} + +a:visited { + color: #0b0080 !important; +} + + +.page_header, .page_header a:visited, .page_header a { + /* copy from h settings in main.css */ + line-height: 1.2; + /* copy of the h3 size in main site. */ + font-size: 21.0667px; + /* same as for main.css */ + color: #333333 !important; +} diff --git a/_site/ian-kelling-pubkey.asc b/_site/ian-kelling-pubkey.asc new file mode 100644 index 0000000..9de9367 --- /dev/null +++ b/_site/ian-kelling-pubkey.asc @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBFMIBFIBEADDMlt1Dn+SzondO+sJSCCOoo0H5svvkQE1PuOjpNx8YDEU3aVB +0VpZMGAU/2Q3B6MUM6p+2+Jw/WlPDYsFNOw8MkRbvNJOVzLaSuDIjpWCezHl/8MH +Wq6CULlQGQR1+Z2MB4EU3PCOFR/IJi/TB1iLf7y0x/laAFYzxSjx8NrSTCVWGms0 +E/9lOyIxi+RQxakCduyJwIKvJokL0zjdpOF6QYagGpGi6ngmCkbgHdioTiRmJcB0 +ObEpDrGYX2dXNexAqeE3UxCEQF9gNHSmZzI7Ko6aNpbz7NXQug4OOPfrCIJ3v6sy +yQmGckp0kCEifj64Hy5V/y6/q01/rZwraD8vzxT8zHfcFj61O6ZZIXiPjxVBsff/ +pnR6xKXRhOoXOjiqA+4iyrsUBjp5nF3qzPRrrMkRHUnm3d6dm2ug2LNBCSd7dQ9X +7fi6/qD8sjtQZDVoyJFizLBgKF0y8Bst5wqmX9XWhlXja+64ZcM29/DtyUpvwxHG +0o7di/aM4jExmicwEa0ucSmoryGbfQqan8NmQIUdIcw7Mre5CoAzgJpkPDxwI5lf +JznPYUfyS5PS/07oNcDPrTIEMgsyySq/oNlRxlqppBsPHnmlIrDX5gm8gmt4vSWl +4jM4PczyVdUf3/JDxHbTBPGU8kvXJrP9/DSEPmP+xAcmlVHR2LRJgPLA5wARAQAB +tCdJYW4gQW5kcmV3IEtlbGxpbmcgPGlhbkBpYW5rZWxsaW5nLm9yZz6JAj0EEwEK +ACcFAlMIBFICGwMFCQHhM4AFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQqszC +QOlpxnsoNxAAs0A4z7h5KeF4ieVqlWtC5iwgtRv+UbT7uSkI0eg2LOrNSvkYnzmr +MtBMcYurcxCbVp2Jak6tkOYrAGGkyJ6/4UpLTeaWSMy11bVqi3ipAWsNHMmqmzDI +r8TIhpj7JhdDkaQGboplsJkDIeKn6uP8k98n1rha5PVu3QzDGou2cTikeaQG26rE +Fgn6zM8FlMQF6D4cQBh9TZJN7mz0QhINwCULEaDYpbWcoicY77aWx8yelnFlF9Hc +57G+uRE55pGoioLQ72UCIQbhSQ3KxYSxvDTpB4BbPqf49rvkVnsCZhZhOfAoK6wk +pGs7iwQi+91GLBYztrJNLCs4bP5XA0fRaw5Ds7fYUSHWfRwCHuF19m+KsgMnXwdO +cENsh6ykaWizxs8sRYdkg4lVi0dDctgPlFI97HSlyKKuDYrNIO2SHsrmiahWyV4D +LF5ApCp0xJBcdjG1Xe8DiRE18Bb8GlenVSE784dRSBJlJAbSWC1tXbcRFQgkVup1 +vIrEHJRGvlp3fnbsVl1/Nx9mLih2fpuLcC8XJ27CaY4NKyspxdH+KEfDgUotQkrE +p3YX4eh/OFiFc1+UkhF9cjmC0G154y8I1odZ31FG3FCoT8p2CL2Jvjq4f5NZ1Mwg +4wl2zTdmoZIeDHUoQJ/TL3+DDIeshMT/G4FFC3/LJrMfv81dw/+tllO5Ag0EUwgE +UgEQAPE276bWBpTEs7iOFDD3/pl+dYAKGIS8B8oOcdugPp8r1LWibcw5+yaAvcMB +sM0AmPAeVqrNDaj+pH0q0SrGr8B+wqeQ+ror3vWXA5xwuoXm3s8KjKp4+gOgXQp3 +ALY7/Rp9Iq2o1HkpF6lalXjV4aK1I71crmHpLvC4On+gIeDZUfXNBlaN7yX79eof +z+6y4/YZd4GIfbBoLHkmVcxK+BeL1z+sfxj2w1HxrZ1UVHtRdZrmlEiD+JkVbLtj +38ecRNsNTIv2jCoRUoYLUKtF5izvmtcBrB58ADDlp84UqM0W+D1xTPETXWG78hlt +8byV5ljKa2vSbBmNf/C1JVlrOBEeVg0oaf2X41CGc4u3haAhMDq+UnXc1nTso5sy +Z9F7j0ZS25mw68LFGFDRZ1fxhU3PSS4DhY9jYgwJBEpoqIdsQ719bGlIrlc/bwLa +ZiWv4WbwOn/9pJtJfYqkJ+fI0LHcjTRXGCwEQTFNLuYwYE7zjXoRiBF/See/PYQj +Ck/UkmCows3JecwXnPzTD+mdSD9lhCqvc7QmBWl3epQ6SrP2qwBNKOzDJdWIaiz1 +UBgKUr10NQW85PqOAjUAeyvaG4Khaa5X8J7x5xwlGMJMHBqAelOOXniTjKtyjoz5 +/p1hDDwezrH0YdRt19LldQOGhYXtoKKZ3zSMaXZL5riThp+TABEBAAGJAiUEGAEK +AA8FAlMIBFICGwwFCQHhM4AACgkQqszCQOlpxnvGfhAAqorlVRJtauDvNuOKzrNq +yexZfRxYbHkwtnRR7DllrrNtC/gyCqwT/mDDgNtdFq6bJPh8l8Fhd0J3EhIkNMrX +uxHhM8pjJJk1D33OVDuGNeHSsROmmEbnuAiItiIyMn2q6HjjSnT5pzxW3CL7LfSC +Bl2l/vLSFGG7338P849UDeYLPZpvRXwC3hu2fp8/rNFKHOm2wsCCTg5iyh/S+piU +rULt2WxkIjGoM9Su3k9sOtPwjMDBPUl8NEn9q38OXjxHPrlSW9o0ByLKXZQMaG63 +nH1wp5IO4NhBxKgXbHLCVCx3h2U4RNc/021wpZygHWhBqpgFjGqEO6wjETkaFRpR +z3/BDb5/ZFGeFzQOivO99AXaQvgvAvUY2dy4CF61HxWFxFsa54MgzAkzs6W5G3Yu +B93jwxseun6kLHmvXwkm8HVq6QU7Sf9fhABlfcchbZu6/NUdOE46z1Y7U0bAedC8 +XJhAaPGaprVMGLrudbHGMbNPup0LeJk0RAuhoaG8FCS+bp9SpQvejXdCDIv5ElGB +SxXXvw+C7U1rSGlwAlxX4SNR5aS3W2oBEyKm8muUA+jv8C9E29Zld4nCnLaw+bp2 +AXr/jB5sZLqUeQAKClLBYMj3a/WLXJPq6+hqUb6pCC3gTqRgUNGWM7gyN4Sq/7ea +Keuep+WYlseAAiCHwMInu18= +=TIon +-----END PGP PUBLIC KEY BLOCK----- diff --git a/_site/main.css b/_site/main.css new file mode 100644 index 0000000..42eb841 --- /dev/null +++ b/_site/main.css @@ -0,0 +1,446 @@ +#cc-by-sa { + /* It sits too high by default. */ + vertical-align: middle; +} + +#comments { + /* add some space at top and bottom of comment section */ + margin: 50px 0; +} + + +div.comment { + /* whitespace doesn't cut it to differentiate multiple comments,*/ + /* so use a line */ + border-top-style: solid; + /* some darkish color, black is too striking */ + border-top-color: #C4C3BC; + /* copied from stackoverflow. */ + border-top-width: 0.716667px; + +} + +#comment-stripe, #comment-stripe code { + /* differentiate comments, don't colorize code */ + background-color: #EBEAE4; +} + +#comment-section { + /* make the top/bottom of comments have more space */ + padding: 30px 0; +} + + +#comment-section textarea:focus, #comment-section textarea:active, #comment-section input:hover { + /* color textarea when selected, and for submit button,*/ + /* without 3d effect, we need a different color. */ + background: #FFFFFF; +} + +#comment-section textarea { + /* go with theme, avoid bright white. */ + background-color: #f6f6f0; +} + +textarea, input { + /* default is some 3d border. use a flat border instead. */ + border: 0; + /* by default text input hugs the edges too much */ + padding: 5px; + /* add some space between input and submit button */ + margin-bottom: 10px; +} + +/* if this is filled out, we can assume it's spam. common tactic. */ +input.misc { + display: none; +} + + +textarea { + /* make the comment box be full width */ + width: 100%; +} + + +ul { + /* i dun like the default bullet points */ + list-style-type: none; +} + +ul.index { + /* for site index lists, bigger font, no indent, more space */ + font-size: 22px; + padding-left: 0; + line-height: 2; +} + +body{ + /* default is too scrunched */ + line-height: 1.5; + /* default too small */ + font-size: 18px; +} + + +/* alternative to a
. whatever. */ +/* https://stackoverflow.com/questions/7363766/how-to-insert-a-line-break-before-an-element-using-css */ +.comment-date:before { content: '\A'; } +.comment-date { + white-space:pre; + /* make it a bit smaller and lighter */ + color: #555; + font-size: 15px; +} + +.post-date { + font-size: 15px; + margin: 5px 0; +} +.post-title { + /* default too wide, got from some random blog */ + letter-spacing: -1px; + /* default is too much below where the date is. */ + margin: 0; +} + +/* make the header links less prominent. */ +header a:visited, header a { + /* link color in top navigation is better as some less eye */ + /* catching color. */ + color: #333333; +} + +.post-header { + margin-bottom: 30px; +} + + +h1,h2,h3{ + line-height: 1.2; +} +.main-content-stripe { + /* i don't like bright white. copy a gitweb color */ + background-color: #f6f6f0; + padding: 30px 0; +} +footer { + padding: 30px 0; +} +footer p { + margin: 0; +} +header,footer,.content,#comment-section { + /* top margin 0, left/right = auto, which centers it */ + margin: 0 auto; + /* default too wide */ + max-width: 700px; +} +footer { + font-size: 15px; +} + +code { + background-color: #fff; + /* defaults are squished next to the borders of the color change */ + padding: 1px 5px; +} + +code, pre { + /* mono text is wider, so use smaller font to compensate */ + font-size: 15px; +} + +pre { + /* defaults are squished next to the borders of the color change */ + padding: 6px 8px; +} + + +/* taken from wikipedia. purple links get a bit old. */ +a { + color: #0645ad; + text-decoration: none; +} +a:hover { + text-decoration: underline; +} +a:visited { + color: #0b0080; +} + +/* grabbed just the rss icon from font-awesome using fontello.com*/ +/* then extracted just the relevant bits out. I tried using svg,*/ +/* since it is more modern and compatible,*/ +/* but it seems that it would take a bunch of work to change it's*/ +/* color, do underline on hover, and line it up with the rest*/ +/* of the text. */ +@font-face { + font-family: 'fontello'; + src: url('/font/fontello.eot?97936362'); + src: url('/font/fontello.eot?97936362#iefix') format('embedded-opentype'), + url('/font/fontello.woff2?97936362') format('woff2'), + url('/font/fontello.woff?97936362') format('woff'), + url('/font/fontello.ttf?97936362') format('truetype'), + url('/font/fontello.svg?97936362#fontello') format('svg'); + font-weight: normal; + font-style: normal; +} +[class^="icon-"]:before, [class*=" icon-"]:before { + font-family: "fontello"; + font-style: normal; + font-weight: normal; + speak: none; + + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + /* opacity: .8; */ + + /* For safety - reset parent styles, that can break glyph codes*/ + font-variant: normal; + text-transform: none; + + /* fix buttons height, for twitter bootstrap */ + line-height: 1em; + + /* Animation center compensation - margins should be symmetric */ + /* remove if not needed */ + margin-left: .2em; + + /* you can be more comfortable with increased icons size */ + /* font-size: 120%; */ + + /* Font smoothing. That was taken from TWBS */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + /* Uncomment for 3D effect */ + /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ +} +.icon-rss:before { content: '\f09e'; } /* '' */ + + + +/* from https://jekyllrb.com/docs/templates/#code-snippet-highlighting*/ +/* links to a 6 year old css file supposedly used by github:*/ +/* https://github.com/mojombo/tpw/blob/master/css/syntax.css*/ +/* googling jekyll source code css, leads*/ +/* https://github.com/jwarby/jekyll-pygments-themes, which seems ok,*/ +/* but I'm curious what the upstream default is. I find rogue has no*/ +/* default. pygments does, so I do that:*/ +/* http://pygments.org/docs/quickstart/*/ +/* fire up python2,*/ + +/* from pygments.formatters import HtmlFormatter */ +/* print HtmlFormatter().get_style_defs('.highlight')*/ + +.highlight .cm { + color: #999988; + font-style: italic; +} +.highlight .cp { + color: #999999; + font-weight: bold; +} +.highlight .c1 { + color: #999988; + font-style: italic; +} +.highlight .cs { + color: #999999; + font-weight: bold; + font-style: italic; +} +.highlight .c, .highlight .cd { + color: #999988; + font-style: italic; +} +.highlight .err { + color: #a61717; + background-color: #e3d2d2; +} +.highlight .gd { + color: #000000; + background-color: #ffdddd; +} +.highlight .ge { + color: #000000; + font-style: italic; +} +.highlight .gr { + color: #aa0000; +} +.highlight .gh { + color: #999999; +} +.highlight .gi { + color: #000000; + background-color: #ddffdd; +} +.highlight .go { + color: #888888; +} +.highlight .gp { + color: #555555; +} +.highlight .gs { + font-weight: bold; +} +.highlight .gu { + color: #aaaaaa; +} +.highlight .gt { + color: #aa0000; +} +.highlight .kc { + color: #000000; + font-weight: bold; +} +.highlight .kd { + color: #000000; + font-weight: bold; +} +.highlight .kn { + color: #000000; + font-weight: bold; +} +.highlight .kp { + color: #000000; + font-weight: bold; +} +.highlight .kr { + color: #000000; + font-weight: bold; +} +.highlight .kt { + color: #445588; + font-weight: bold; +} +.highlight .k, .highlight .kv { + color: #000000; + font-weight: bold; +} +.highlight .mf { + color: #009999; +} +.highlight .mh { + color: #009999; +} +.highlight .il { + color: #009999; +} +.highlight .mi { + color: #009999; +} +.highlight .mo { + color: #009999; +} +.highlight .m, .highlight .mb, .highlight .mx { + color: #009999; +} +.highlight .sb { + color: #d14; +} +.highlight .sc { + color: #d14; +} +.highlight .sd { + color: #d14; +} +.highlight .s2 { + color: #d14; +} +.highlight .se { + color: #d14; +} +.highlight .sh { + color: #d14; +} +.highlight .si { + color: #d14; +} +.highlight .sx { + color: #d14; +} +.highlight .sr { + color: #009926; +} +.highlight .s1 { + color: #d14; +} +.highlight .ss { + color: #990073; +} +.highlight .s { + color: #d14; +} +.highlight .na { + color: #008080; +} +.highlight .bp { + color: #999999; +} +.highlight .nb { + color: #0086B3; +} +.highlight .nc { + color: #445588; + font-weight: bold; +} +.highlight .no { + color: #008080; +} +.highlight .nd { + color: #3c5d5d; + font-weight: bold; +} +.highlight .ni { + color: #800080; +} +.highlight .ne { + color: #990000; + font-weight: bold; +} +.highlight .nf { + color: #990000; + font-weight: bold; +} +.highlight .nl { + color: #990000; + font-weight: bold; +} +.highlight .nn { + color: #555555; +} +.highlight .nt { + color: #000080; +} +.highlight .vc { + color: #008080; +} +.highlight .vg { + color: #008080; +} +.highlight .vi { + color: #008080; +} +.highlight .nv { + color: #008080; +} +.highlight .ow { + color: #000000; + font-weight: bold; +} +.highlight .o { + color: #000000; + font-weight: bold; +} +.highlight .w { + color: #bbbbbb; +} +.highlight { + background-color: #f8f8f8; +} diff --git a/_site/on2vote/on2-vote-detailed-analysis.txt b/_site/on2vote/on2-vote-detailed-analysis.txt new file mode 100644 index 0000000..22e8b0e --- /dev/null +++ b/_site/on2vote/on2-vote-detailed-analysis.txt @@ -0,0 +1,177 @@ +Filtered to one vote per word per ip, and removed voters who did not vary their vote. +median "sounds ok" = 0.310910118711, standard deviation = 0.0494053962862 + +1st field = "sounds good" to total votes +2nd field = "sounds good" to "sounds wrong or confusing" +3rd field = "sounds ok" to total votes. +4th field = "sound wrong or confusing" to total votes. +big oh of n squared +0.65 0.83 0.22 0.13 +oh n squared +0.55 0.71 0.23 0.22 +big oh n squared +0.54 0.79 0.31 0.15 +oh of n squared +0.54 0.71 0.24 0.22 +order n squared +0.49 0.68 0.27 0.24 +order of n squared +0.49 0.72 0.32 0.19 +complexity of n squared +0.47 0.69 0.32 0.21 +quadratic time +0.45 0.61 0.26 0.29 +big oh complexity of n squared +0.43 0.62 0.31 0.26 +quadratic run time +0.41 0.58 0.29 0.30 +computational complexity of n squared +0.38 0.60 0.36 0.25 +run time of n squared +0.38 0.53 0.29 0.33 +big oh complexity n squared +0.36 0.59 0.39 0.25 +quadratic complexity +0.35 0.54 0.35 0.30 +order of complexity of n squared +0.35 0.55 0.37 0.28 +quadratic time complexity +0.34 0.54 0.37 0.29 +time complexity of n squared +0.31 0.47 0.34 0.35 +quadratic computational complexity +0.31 0.41 0.26 0.44 +algorithmic complexity of n squared +0.30 0.48 0.37 0.32 +order of complexity n squared +0.30 0.48 0.38 0.32 +time complexity n squared +0.29 0.43 0.33 0.38 +complexity n squared +0.29 0.45 0.36 0.35 +quadratic growth +0.29 0.43 0.32 0.39 +quadratic order of complexity +0.28 0.42 0.33 0.38 +run time n squared +0.28 0.45 0.37 0.35 +quadratic algorithmic complexity +0.27 0.42 0.35 0.38 +big oh efficiency of n squared +0.26 0.41 0.36 0.38 +quadratic growth rate +0.26 0.40 0.35 0.39 +efficiency of n squared +0.26 0.35 0.26 0.48 +growth rate of n squared +0.25 0.38 0.33 0.42 +algorithmic complexity n squared +0.25 0.41 0.39 0.36 +quadratic big oh +0.24 0.33 0.26 0.49 +time efficiency of n squared +0.24 0.35 0.31 0.44 +quadratic big oh complexity +0.24 0.40 0.39 0.37 +quadratic order +0.24 0.36 0.34 0.42 +algorithmic efficiency of n squared +0.24 0.35 0.31 0.45 +asymtotic run time of n squared +0.24 0.36 0.33 0.43 +growth of n squared +0.23 0.36 0.35 0.41 +quadratic time growth rate +0.23 0.31 0.25 0.52 +quadratic asymtotic complexity +0.23 0.32 0.28 0.49 +big oh efficiency n squared +0.23 0.33 0.32 0.45 +computational complexity n squared +0.22 0.36 0.38 0.40 +quadratic efficiency +0.22 0.31 0.28 0.50 +quadratic algorithmic efficiency +0.22 0.31 0.28 0.50 +quadratic bound +0.21 0.30 0.29 0.50 +asymtotic growth of n squared +0.21 0.28 0.24 0.55 +big oh growth rate n squared +0.21 0.33 0.35 0.44 +time n squared +0.21 0.27 0.22 0.57 +quadratic time efficiency +0.21 0.29 0.28 0.51 +quadratic asymtotic run time +0.20 0.27 0.25 0.54 +asymtotic run time n squared +0.20 0.29 0.30 0.50 +growth rate n squared +0.20 0.31 0.36 0.44 +asymtotic complexity n squared +0.20 0.28 0.29 0.51 +big oh growth rate of n squared +0.20 0.29 0.32 0.48 +quadratic asymtotic growth +0.19 0.25 0.25 0.56 +time of n squared +0.18 0.26 0.28 0.53 +asymtotic growth rate of n squared +0.18 0.29 0.36 0.45 +quadratic asymtotic efficiency +0.18 0.23 0.21 0.61 +algorithmic growth rate of n squared +0.18 0.24 0.27 0.55 +computational growth rate of n squared +0.18 0.28 0.38 0.45 +computational efficiency of n squared +0.18 0.27 0.34 0.48 +quadratic computational efficiency +0.17 0.22 0.22 0.61 +asymtotic growth n squared +0.17 0.25 0.32 0.51 +quadratic big oh efficiency +0.17 0.23 0.27 0.56 +bound of n squared +0.17 0.28 0.40 0.43 +quadratic big oh growth rate +0.16 0.23 0.31 0.54 +quadratic algorithmic growth rate +0.15 0.22 0.30 0.54 +asymtotic bound n squared +0.15 0.27 0.45 0.40 +computational growth rate n squared +0.15 0.21 0.31 0.54 +quadratic asymtotic bound +0.15 0.20 0.28 0.57 +asymtotic complexity of n squared +0.14 0.20 0.31 0.55 +asymtotic efficiency of n squared +0.14 0.21 0.33 0.53 +time growth rate of n squared +0.14 0.19 0.28 0.58 +algorithmic efficiency n squared +0.14 0.20 0.31 0.56 +efficiency n squared +0.13 0.18 0.27 0.60 +asymtotic efficiency n squared +0.13 0.18 0.29 0.58 +time efficiency n squared +0.12 0.19 0.33 0.54 +algorithmic growth rate n squared +0.12 0.17 0.28 0.60 +quadratic computational growth rate +0.12 0.18 0.32 0.56 +growth n squared +0.11 0.17 0.32 0.57 +quadratic asymtotic growth rate +0.10 0.15 0.29 0.61 +bound n squared +0.10 0.15 0.31 0.59 +time growth rate n squared +0.10 0.13 0.20 0.70 +asymtotic growth rate n squared +0.09 0.11 0.25 0.66 +computational efficiency n squared +0.08 0.12 0.33 0.59 diff --git a/_site/on2vote/vote.py b/_site/on2vote/vote.py new file mode 100644 index 0000000..bff1b0f --- /dev/null +++ b/_site/on2vote/vote.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python2 +# -*- coding: UTF-8 -*- + +import os +import cgi +# enable error logging +import cgitb +import json +import socket +cgitb.enable(display=0, logdir="../../logs") + +# https://docs.python.org/2/library/cgi.html +form = cgi.FieldStorage() +# parse the form data into a dictionary +vote = json.loads(form.value) + +dir = '/a/www-data/on2votes/' + socket.gethostname() +if not os.path.exists(dir): + os.makedirs(dir) + +# ips are semi-pii, so we keep this data saved away, and +# from time to time, throw away data with too much +# duplicate ips, then throw away all the ip data. +vote['ip'] = os.environ['REMOTE_ADDR'] +with open(dir + '/on2votes.log', 'a') as f: + json.dump(vote,f) + f.write("\n") + +# not that it matters, but tell the client we are happy. +print "Status: 200 OK\n"; +# to read back: +#!/usr/bin/env python +# import json +# with open('../logs/vote.txt', 'r') as f: +# for line in f: +# print json.loads(line) diff --git a/_site/on2vote/votes.txt b/_site/on2vote/votes.txt new file mode 100644 index 0000000..39a86da --- /dev/null +++ b/_site/on2vote/votes.txt @@ -0,0 +1,3 @@ +{"vote": "yes", "ip": "192.168.1.1", "word": "The end."} +{"vote": "meh", "ip": "192.168.1.1", "word": "growth rate of n squared"} +{"vote": "meh", "ip": "192.168.1.1", "word": "computational efficiency of n squared"} diff --git a/_site/robots.txt b/_site/robots.txt new file mode 100644 index 0000000..b64f8b8 --- /dev/null +++ b/_site/robots.txt @@ -0,0 +1,2 @@ +User-agent: ia_archiver +Disallow: /resume.html diff --git a/b.rb b/b.rb new file mode 100644 index 0000000..511ac8d --- /dev/null +++ b/b.rb @@ -0,0 +1,300 @@ +# encoding: utf-8 +# Copyright (C) 2016 Ian Kelling + +# 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 2 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 . +module B # blog module + require 'fileutils' + require 'time' + require 'safe_yaml' + require 'pygments' + require 'sqlite3' + require 'redcarpet' + JS_INFO = "

All JavaScript has LibreJS support.

" + + DAY = 60*60*24 + DN = 'iankelling' + FQDN = DN + '.org' + DURL = 'https://' + FQDN + DESCRIPTION = "Ian Kelling's personal site and blog on software" + DATE_LEN = 'YYYY-MM-DD'.length + NOW = Time.now.to_f + WAIT_DATE = NOW - 60*60*24*1 + + def db_init + SQLite3::Database.new('../proposed-comments/comments.sqlite') + end + + # from the redcarpet readme, then a bunch of googling to figure + # out what to do on exception. + class HTMLwithPygments < Redcarpet::Render::HTML + def block_code(code, language) + begin + Pygments.highlight(code, lexer: language) + rescue MentosError + # when language detection fails + Pygments.highlight(code, lexer: 'text') + end + end + end + + def fwrite(output_path, string) + FileUtils.mkdir_p(File.dirname(output_path)) + File.write(output_path, string) + end + + def fskel(rel_path, title, content, o={}) + head = < +EOF + if rel_path =~ %r{^blog/.} + head += < +EOF + end + o[:head] = head + fwrite(rel_path, skel(title, content, o)) + end + def skel(title, content, o={}) + # got meta viewport from jekyll's default later. It's for better + # mobile viewing. + output = < + + + + #{title} + + + + +#{o[:head]} + + + +
+

iankelling.org#{o[:header]}

+
+
+
+ #{content} +
+
+
+#{o[:comments]} +
+
+#{o[:footer]} +

This site has a git repo. Code is gpl, content is Creative Commons License unless otherwise noted

+

ian@iankelling.org let me know what you think

+
+ + +EOF + output + end + + def stdpage(page_name, content) + fskel("#{page_name}.html", + "#{DN}/#{page_name}", + content, + header: " / #{page_name}") + end + + def md_to_html(md) + # Using redcarpet over kramdown because syntax highlighting is + # simpler. kramdown uses some crap highlighter by default, + # supports using rouge, but then the classes are all screwy + # for what pygments css expects, rouge has a pygments compatibility mode, + # but that is a pita to get working, then it doesn't even work right. + # kramdown is jekyll's default markdown parser, but it doesn't use + # it for code blocks, it strips them out using custom templating + # extension class, then uses rouge, then wraps it in some + # custom html for pygments compatibility. It's a complicated mess. + Redcarpet::Markdown.new(HTMLwithPygments, fenced_code_blocks: true).render(md) + end + + def comment_html(comment, date) + inner = Redcarpet::Markdown.new(Redcarpet::Render::HTML, fenced_code_blocks: true).render(<#{Time.at(date).strftime("%b %-d '%y")} +EOF + # I tried putting the time, %I:%M %p UTC, but it looks kinda + # clunky, going against my simple theme. + < + #{inner} + +EOF + end + + def post(file, build_time=false) + content = File.read(file) + content =~ %r{\A(---\s*\n.*?\n?)^((---)\s*$\n?)}m # yaml front matter + # stuff after last match. jekyll uses $POSTMATCH, + # but it's nil for me, I don't know what magic they are using., + # but only $' is listed here http://ruby-doc.org/core-2.3.1/doc/globals_rdoc.html, + content = $' + + front = SafeYAML.load(Regexp.last_match(1)) + title = front['title'] + $page_title = "#{title} | #{DN}" + header_rel = ' / blog /' + + footer_extra = <<-EOF +

Subscribe

+EOF + footer_extra += JS_INFO if content =~ / + +My next blog post [has the results](/blog/on2-vote-results.html). + +Where did I get these terms? Just a few clicks around the internet and my own experience. I started idly writing a few, which started to become a [Backus–Naur Form (BNF)](https://en.wikipedia.org/wiki/Backus%E2%80%93Naur_Form). Then I got quite annoyed that I couldn't figure out how to properly pronounce Naur. Turns out it's [like now-ah](http://forvo.com/search/naur/). Then I wrote a python program which expands the BNF to all possible combinations: + +~~~ py +from itertools import product + +def bnf_expand(*args): + result = [] + for arg in args: + result.extend([" ".join(filter(None, x)) for x in product(*arg)]) + return result + +# the BNF in reverse of normal order +asymtotic = ['asymtotic', ''] +asymtotic_modified = ['bound', 'run time', 'growth', 'growth rate'] +commonly_modified = ['complexity', 'efficiency', 'growth rate'] +common_modifiers = ['computational', 'big oh', 'algorithmic', 'time', + 'asymtotic', ''] +unmodified = ['big oh', 'order', 'order of complexity', 'time'] +O = bnf_expand([asymtotic, asymtotic_modified], + [common_modifiers, commonly_modified], [unmodified]) +of = ['of', ''] +On2 = bnf_expand([O, of, ["n squared"]], [['quadratic'], O], + [['oh n squared']], [['oh of n squared']]) + +# Print the top level expanded BNF +print On2 +~~~ + +The result is 92 terms which can work the same in a conversation (unless your votes/comments say otherwise). And that doesn't even consider whether to say someting _is_ O(n²), _has_ O(n²), or _is of_ O(n²). + +The list is a bit long, so I put them in javascript and made some buttons. + +You might call all these words "terms of art", or "jargon", or "lingo"... orrr, let's call the whole thing off. diff --git a/blog/2014-10-14-on2-vote-results.md b/blog/2014-10-14-on2-vote-results.md new file mode 100644 index 0000000..f396e7b --- /dev/null +++ b/blog/2014-10-14-on2-vote-results.md @@ -0,0 +1,27 @@ +--- +title: "Voting results for language around O(n²)" +comment_links: + reddit: https://www.reddit.com/r/programming/comments/2j9kne/rprogramming_you_voted_on_language_around_on%C2%B2/ +--- +I [previously](/09-29-2014/say-On2.html) lamented that we are stuck with many roughly equivalent ways to say technical terms/phrases. Then I proposed over 88 ways to talk about O(n²) in computer science with voting buttons for "sounds good", "sounds ok", and "sounds wrong/confusing." + +After 13k votes, mostly from [/r/programming](https://www.reddit.com/r/programming) readers, here are the results. + +There were four almost equally most popular terms, with plenty of people prefering one over the others. + ++ "big oh of n squared" ++ "order [of] n squared" ++ "complexity of n squared" ++ "quadratic time" + +Removal of "of" was slightly less popular (except for "order" which was basically equal). Other variations of the four were a bit less popular still. + +As I noted, opinions were split, with ~55% "sounds good", ~25% "sounds ok", and ~20% "sounds wrong or confusing" for each. For people who liked one of these four, they also had a preference for its minor variations, but felt average for the other three. + +"big oh of n squared" did have an edge, which I think is at least partially due to the fact that I used O(n²) when writting about the topic. In a proper experiment, I would have interviewed people verbally and used a random term to introduce the topic. + +There weren't any words that stood out as universally disliked, although a few awkward combinations rounded the bottom with 60% "sounds wrong or confusing." I would recommend using one of the above, or a variation, which is still about 20 options. + +That is the high level overview. If you want to see all the words and their vote percentages, they are [here](/on2/on2-vote-detailed-analysis.txt). + +Natural language sure can complicate things. Looking at data can give us some insights though. I wonder how preferences will change in 5 or 10 years. diff --git a/blog/2016-08-23-site-redesign.md b/blog/2016-08-23-site-redesign.md new file mode 100644 index 0000000..5538ead --- /dev/null +++ b/blog/2016-08-23-site-redesign.md @@ -0,0 +1,11 @@ +--- +title: "Site redesigned. Random thoughts" +--- + +Please let me know what you think of the current site design. It's my own creation. + +Disqus and it's ilk suck: it pushes tracking, advertising, and proprietary javascript on your users. The comments aren't saved by archive.org. People have lots more reasons they dislike it. NPR just deleted 2.8 billion Disqus comments. Unfortunately, there is no really simple way to add self hosted comments to your static blog, so I bit the bullet and wrote code for it. + +I originally used Jekyll (the most popular static site generator), but I ditched it and made my own site generator. It was fun. One nice thing is I can still serve a static site with static comments (comment submission is obviously a little dynamic): I regen a page in 120ms, compared to jekyll at 430 ms, and I'm not sure if that time would grow for a bigger site etc. The alternative of course is to make the site non-static or use some javascript hackery. + +Although I don't use much javascript (none on this page), I added javascript license data so the [librejs](https://www.gnu.org/software/librejs/) extension can detect that it is free software. It was pretty easy, and I recommend it. diff --git a/build.rb b/build.rb new file mode 100755 index 0000000..4a6c268 --- /dev/null +++ b/build.rb @@ -0,0 +1,89 @@ +#!/usr/bin/env ruby +# Copyright (C) 2016 Ian Kelling + +# 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 2 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 . + +require 'fileutils' +require 'time' +require 'sqlite3' + +Dir.chdir(File.join(File.dirname(__FILE__), '_site')) +require_relative 'b' +include B + + +feed_entries = [] +blog_list = [] # table data + + +FileUtils.mkdir_p('../proposed-comments') +FileUtils.chmod(0777, '../proposed-comments') +FileUtils.rm Dir.glob('blog/*') + +$db = db_init +# date has no type affinity, since floating point (REAL) doesn't +# have an appropriate one. +$db.execute <<-SQL + create table if not exists c ( + id integer primary key, + state text, + ip text, + date, + page text, + comment text + ) +SQL + +FileUtils.chmod(0777, '../proposed-comments/comments.sqlite') + +# We assume blog entry files are prefixed by date +# so we can just sort the filenames. +Dir.glob('../blog/*.md').sort.reverse.each do |file| + [feed_entries, blog_list].zip(post(file, true)) { |arr, new| arr << new } +end +FileUtils.chmod_R(0777, 'blog') +FileUtils.mkdir_p('../comments/blog') +FileUtils.chmod_R(0777, '../comments') + + +# main reference doc https://validator.w3.org/feed/docs/atom.html +# Reference doc says updated should be last time it changed +# but jekyll's rss feed just uses current time, which is easier to get, +# so meh, i'll just use that. +fwrite('feed.xml', < + + + Ian Kelling + #{DURL} + + #{DURL} + + Ian Kelling's Blog + #{Time.now.to_datetime.rfc3339} + #{feed_entries.join("\n")} + +EOF + +fskel('index.html', DN, File.read('../index.html')) + +stdpage('blog', < + #{blog_list.join("\n")} + +EOF + +stdpage('resume', md_to_html(File.read('../resume.md'))) + +stdpage('favorite-stuff', File.read('../favorite-stuff.html')) diff --git a/drafts/.gitignore b/drafts/.gitignore new file mode 100644 index 0000000..120f485 --- /dev/null +++ b/drafts/.gitignore @@ -0,0 +1,2 @@ +* +!/.gitignore diff --git a/favorite-stuff.html b/favorite-stuff.html new file mode 100644 index 0000000..6a85ffb --- /dev/null +++ b/favorite-stuff.html @@ -0,0 +1,74 @@ +

Podcast

+ + + +

News/Blogs

+ + + +

Video

+ +
    +
  • Mr. Robot
    • +
  • Robot and Frank
    • +
  • 2001: A Space Odyssey
    • +
  • Cloud Atlas
    • +
  • Adaptation
    • +
+ + +

Music

+ + + +

Misc

+ diff --git a/feed.xml b/feed.xml new file mode 100644 index 0000000..e69de29 diff --git a/get-comments b/get-comments new file mode 100755 index 0000000..36bbe0d --- /dev/null +++ b/get-comments @@ -0,0 +1,49 @@ +#!/bin/bash +# Copyright (C) 2016 Ian Kelling + +# 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 . + +set -eE -o pipefail +trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR + +cd "${BASH_SOURCE%/*}/proposed-comments" + +all=false +shell="ssh iankelling.org" +while [[ $1 ]]; do + case $1 in + -a) all=true; shift ;; + -l) shell= ; shift ;; # -l for local + esac +done + +s="$shell sqlite3 $PWD/comments.sqlite" + +if ! $all; then + date=$($s <<'EOF' +select max(date) from c where +state = 'moderated' or +state = 'banned' or +state = 'picked'; +EOF + ) +fi + +# we may want to avoid rate limited posts here too. +sql="select * from c" +if [[ $date ]]; then + date_clause=" where date > cast('$date' as real)" +fi +echo "$sql" +$s "$sql" > /tmp/hcomments diff --git a/gimp-src/favicon.xcf b/gimp-src/favicon.xcf new file mode 100644 index 0000000..079bdf7 Binary files /dev/null and b/gimp-src/favicon.xcf differ diff --git a/iank-mod.el b/iank-mod.el new file mode 100644 index 0000000..26da79d --- /dev/null +++ b/iank-mod.el @@ -0,0 +1,52 @@ +;; Copyright (C) 2016 Ian Kelling + +;; 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 . + +(defun iankmod-start () + (interactive) + (shell-command "/a/h/get-comments" "*messages*") + (find-file "/tmp/hcomments") + (iankmod 1)) +(defun iankmod-save () + (interactive) + (shell-command "/a/h/set-comments" "*messages*")) + + +(defun iankmod-set-state (state) + (beginning-of-line) + (re-search-forward "|" nil t) + (re-search-forward "[^|]*" nil t) + (replace-match state) + (forward-line)) + +(defun iankmod-pick () + (interactive) + (iankmod-set-state "picked")) + +(defun iankmod-ban () + (interactive) + (iankmod-set-state "banned")) + +(defun iankmod-moderate () + (interactive) + (iankmod-set-state "moderated")) + +(define-minor-mode iankmod + "Moderation of comments for iankelling.org" + :keymap (let ((map (make-sparse-keymap))) + (define-key map (kbd "p") 'iankmod-pick) + (define-key map (kbd "b") 'iankmod-ban) + (define-key map (kbd "m") 'iankmod-moderate) + (define-key map (kbd "x") 'iankmod-save) + map)) diff --git a/index.html b/index.html new file mode 100644 index 0000000..049259f --- /dev/null +++ b/index.html @@ -0,0 +1,8 @@ + diff --git a/set-comments b/set-comments new file mode 100755 index 0000000..5694629 --- /dev/null +++ b/set-comments @@ -0,0 +1,37 @@ +#!/bin/bash +# Copyright (C) 2016 Ian Kelling + +# 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 . + +set -eE -o pipefail +trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR + +cd "${BASH_SOURCE%/*}/proposed-comments" + + +shell="ssh iankelling.org" +while [[ $1 ]]; do + case $1 in + -a) all=true; shift ;; + -l) shell= ; shift ;; # -l for local + esac +done +s="$shell sqlite3 $PWD/comments.sqlite" + + +grep -Eo '^[^|]+\|[^|]+' /tmp/hcomments | while IFS='|' read -r id state; do + #echo "$id -- $state" # debug print + sqlite3 comments.sqlite "update c set state='$state' where id = '$id'" +done +$shell $PWD/../build.rb diff --git a/setup.sh b/setup.sh new file mode 100755 index 0000000..3230bba --- /dev/null +++ b/setup.sh @@ -0,0 +1,181 @@ +#!/bin/bash -l +# Copyright (C) 2016 Ian Kelling + +# 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 2 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 . + +# This script depends on a few other git repos of mine, such as +# distro-functions, basic-https-conf, acme-tiny-wrapper + +set -eE -o pipefail +trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR + +cd "${BASH_SOURCE%/*}" + +domain=${1:-iankelling.org} # use argument for testing site +gitroot=/a/bin/githtml + +shopt -s extglob + +type -P a2enmod &>/dev/null || pi apache2 + +acme-tiny-wrapper $domain + +pkgs=( + # build.rb dependencies + ruby-pygments.rb ruby-safe-yaml ruby-redcarpet + # python pkgs used for o(n^2) voting blog entry + python-bcrypt python-passlib + # gitweb pkgs + gitweb highlight +) +pi ${pkgs[@]} +chmod og+x _site/on2vote/vote.py + + +# debian has the package gitweb, which seems to mainly +# have some example apache config, and a minimal gitweb config. +# I'll just use the config as example and not use the package. +# It's example apache config seems to say we can use cgi or cgid, +# and googling cgid it seems a newer faster alternative. I also +# depend on this in my o(n^2) python script. +sudo a2enmod cgid + + +# additional settings from browsing https://git-scm.com/docs/gitweb.conf +s dd of=/etc/gitweb.conf < '/' ], +); +our \$home_link_str = 'git'; +our \$site_footer = '$PWD/_site/gitweb-footer.html'; +push @stylesheets, "/gitweb-site.css"; +push @stylesheets, "/common.css"; +our \$favicon = '/assets/favicon.png'; +# default is 25, cuts off descriptions. +our $projects_list_description_width = 40; +# a bit superflous since they are all me +our $omit_owner = true; +# highlight scripts with no extension, uses a patch +# that is on it's way upstream. +our $highlight_force = 1; +EOF + +apache-site - $domain < + # to run python scripts with cgi + Options +ExecCGI + AddHandler cgi-script .py + + +# redirect some old paths when I was using jekyll. +Redirect permanent /10-14-2014/On2-vote-results.html /blog/on2-vote-results.html +Redirect permanent /09-29-2014/say-On2.html /blog/say-on2.html +Redirect permanent /08-07-2014/uninstalling-setup.html /blog/python-uninstall.html +Redirect permanent /08-01-2014/publising-my-technical-notes.html /blog/publishing-my-technical-notes.html + +# All below is for gitweb + git-http-web. +# A simple builtin way to have a read only git website. +# I didn't find any significantly better alternatives out there. +SetEnv GIT_PROJECT_ROOT $gitroot +SetEnv GIT_HTTP_EXPORT_ALL + +# note: cgi scripts can go anywhere into the filesystem, +# so there is no need to do a directory block for $gitroot + +# fot git-http-web + + AllowOverride None + Require all granted + + + + Options +FollowSymLinks +ExecCGI + AddHandler cgi-script .cgi + + +# from man-git-http-backend, so git-http-web ang gitweb can both be used. +# it is instead of this: +# #ScriptAlias / /usr/lib/git-core/git-http-backend/ +ScriptAliasMatch \\ + "(?x)^/git/(.*/(HEAD | \\ + info/refs | \\ + objects/(info/[^/]+ | \\ + [0-9a-f]{2}/[0-9a-f]{38} | \\ + pack/pack-[0-9a-f]{40}\\.(pack|idx)) | \\ + git-(upload|receive)-pack))\$" \\ + /usr/lib/git-core/git-http-backend/\$1 + + + +# man-git-http-backend claims we should do this, but +# it causes no css/images to be displayed. Instead, +# just stick with the standard gitweb example directive +# from debian. +#ScriptAlias /git /usr/share/gitweb/gitweb.cgi/ +Alias /git /usr/share/gitweb +EOF + + +# my projects all have README or --help with a short single line +# description which I parse and put into the gitweb description. +_git_desc_readme() { + while read -r line; do + [[ $line ]] || continue + if echo "$line" | grep "^ *[#*]" &>/dev/null; then + continue + fi + echo "$line" > .git/description + break + done < README* +} +gitweb_descriptions() { + for d in $gitroot/*; do + d=$(readlink -f $d) + cd $d/.. + e ${PWD##*/} + shopt -s nullglob + f=(!(LICENSE|COPYING|README|.git)) + shopt -u nullglob + if [[ ${#f[@]} == 1 && ! -d $f ]]; then + if [[ ! -x $f ]]; then + if [[ $f == *-function ]]; then + ${f%-function} --help | sed -n '2p' > .git/description + else + _git_desc_readme + fi + else + $f --help | sed -n '2p' > .git/description + fi + else + _git_desc_readme + fi + done +} + +gitweb_descriptions + +./build.rb