From: Ian Kelling Date: Tue, 16 Apr 2024 06:13:03 +0000 (-0400) Subject: remove unused file X-Git-Url: https://iankelling.org/git/?p=iankelling.org;a=commitdiff_plain;h=refs%2Fheads%2Fmaster;hp=35dea67c2f972fe7552820841f7c550129a6add0 remove unused file --- diff --git a/.gitignore b/.gitignore index ed9a601..e8f1bd7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ /resume.md /_site/resume.html /_site/tmp +/_site/misc +/_site/gitstats* diff --git a/LICENSE b/LICENSE deleted file mode 100644 index d645695..0000000 --- a/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - 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 index 7957f6e..4f82576 100644 --- a/README +++ b/README @@ -1,5 +1,9 @@ Content and automated setup of iankelling.org +* todo + +Retire comments, it should just say: email me. + * Dependencies Requires a modern debian based OS, tested on debian 8 & 9. diff --git a/_site/cgi/comment b/_site/cgi/comment index 1497994..bf3cf5b 100755 --- a/_site/cgi/comment +++ b/_site/cgi/comment @@ -1,19 +1,7 @@ #!/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 . +# Copyright (C) 2019 Ian Kelling +# SPDX-License-Identifier: AGPL-3.0-or-later # debian sets LANG=C when starting apache2. # the envoding comment above fixes the internal encoding afaik, @@ -311,13 +299,13 @@ new_count = new_count[0][0] if new_count == 1 require 'net/smtp' - to = 'root@' + FQDN + to = 'root@localhost' from = 'www-data@' + FQDN server = 'localhost' msg = < To: <#{to}> -Subject: "new comment on #{FQDN}" +Subject: new comment on #{FQDN} empty body END_OF_MESSAGE diff --git a/_site/gitweb_home.html b/_site/gitweb_home.html index 771af1c..035faf0 100644 --- a/_site/gitweb_home.html +++ b/_site/gitweb_home.html @@ -1,5 +1,7 @@ -

I actively maintain these projects. Please use them and send me feedback, patches, etc.

+

Since 2017, most code I've written is in support of FSF and GNU, usually system administration related and not public or not publicized. The most generally useful public package I've written is a Bash stack trace and error handling library, Bash Bear Trap, and a Bash Style Guide that talks about Bash error handling.

-

Once a project has a few users, I also put it on my -gitlab.com account +

If you find any of these useful, let me know. Patches welcome, email to ian@iankelling.org

+ +

A few of these are mirrored on +sr.ht sourcehut account in case that helps people contribute or use them.

diff --git a/_site/technical-notes/router-arris-sb8200-source-code.html b/_site/technical-notes/router-arris-sb8200-source-code.html index 67f7923..0fa2bb4 100644 --- a/_site/technical-notes/router-arris-sb8200-source-code.html +++ b/_site/technical-notes/router-arris-sb8200-source-code.html @@ -22,96 +22,96 @@ in 2017. I've copied this from the web interface of the modem and publishing it here since I do not see it anywhere else online. At the bottom, there are a bunch of license texts and copyright holder notices that I've omitted.

-
Open Source Software Information
+
Open Source Software Information
 
-For instructions on how to obtain a copy of any source code being made publicly available by ARRIS related to software used in this ARRIS product you may send your request in writing to:
+For instructions on how to obtain a copy of any source code being made publicly available by ARRIS related to software used in this ARRIS product you may send your request in writing to:
 
-   ARRIS
-   Software Pedigree Operations
-   2450 Walsh Avenue
-   Santa Clara, CA 95051
-   USA
+   ARRIS
+   Software Pedigree Operations
+   2450 Walsh Avenue
+   Santa Clara, CA 95051
+   USA
 
-The ARRIS website opensource.arris.com also contains information regarding ARRIS's use of open source. ARRIS has created the opensource.arris.com to serve as a portal for interaction with the software community-at-large.
-This document contains additional information regarding licenses, acknowledgements and required copyright notices for open source packages used in this ARRIS product.
+The ARRIS website opensource.arris.com also contains information regarding ARRIS's use of open source. ARRIS has created the opensource.arris.com to serve as a portal for interaction with the software community-at-large.
+This document contains additional information regarding licenses, acknowledgements and required copyright notices for open source packages used in this ARRIS product.
 
 
 
 
 
-Component   Version     License
-BSOpen Source Components Included in the BFC/CXC Packages
-OpenSSH     4.0p1   BSD Style (OpenSSH) License
-eCos    2.0     eCos License
-Kerberos    V5 Rel 1.5.1    MIT License
-Mongoose Web Server     3.0     MIT License
-dygraphs    1.2     MIT License
-EXPAT   1.95.8  MIT License
-aRes DNS    1.1.0   MIT License
-NetSNMP     5.0.9   NetSNMP License
-OpenSSL     1.0.1k  OpenSSL License and the original SSLeay License
-MD5 Message-Digest Algorithm    N/A     RSA MD5 License
-Fast CRC32  N/A     Richard Black Fast CRC32 License
-SFL - The Standard Function Library     N/A     SFL iMatix License
-nameser.h   8.1     The Regents of the University of California
-regex   N/A     University of Toronto License
-STUN Client and Server Library  0.96    Vovida Software License 1.0
-KAME IPv6 Stack     N/A     WIDE Project License
-traceroute  N/A     WIDE Project License
-traceroute6     1.42    WIDE Project License
-TinyXML     N/A     zlib License
-List of Open Source Included in the Linux eRouter and Residential Gateway
-axis2/c     1.6.0   Apache License 2.0
-base64  0.00.00B    base64 License
-map (Yyatta ASAMAP)     3/14/2014   BEER-WARE License
-YUI Compressor  2.4.7   BSD License
-tcpdump     3.9     BSD License
-Dropbear sshd   0.46    Dropbear License
-gptfdisk    0.8.7   GPL
-ifenslave   1.1.0   GPL
-bridge-utils    1.2     GPLv2
-conntrack-tools Includes:libnetfilter,libnetflink   0.9.14  GPLv2
-dbus    1.4.14  GPLv2 or The Academic Free License version 2.1
-ebtables    2.0.10-4    GPLv2
-iproute2    iproute2-ss140804   GPLv2
-udhcp   0.9.6   GPLv2
-zebra   0.93    GPLv2
-binutils    2.23    GPLv2
-cortex  0.1     GPLv2
-sqlite3     8.6     GPLv2
-e2fsprogs   1.41.14     GPLv2
-mtdutils    1.0     GPLv2
-ethtool     3.15    GPLv2
-bash    3.2     GPLv2
-busybox     1.21.1  GPLv2
-eglibc  2.18    GPLv2
-Linux   3.14    GPLv2
-iptables    1.6.0   GPLv2e
-iperf   2.0.0   iperf License
-avahi   0.6.30  LGPLv2.1
-libdaemon   0.14    LGPLv2.1
-dnsmasq     1.8     LGPLv2
-procps  3.2.7   LGPLv2
-i2c-tools   3.1.1   LGPLv2
-wdmd    2.2     LGPLv2
-libxml2     N/A     MIT License
-jsonc   0.12    MIT License
-jquery  v1.10.2     MIT license
-jQuery Color Animations     v2.1.2  MIT license
-Sizzle CSS Selector Engine  v1.10.2     MIT License
-expat   2.0.1   MIT/X Consortium license
-Net SNMP    5.7.2   NetSNMP License
-nodejs  v0.10.12    Node's license
-openssl     1.0.1j  OpenSSL License and the original SSLeay license
-radvd   1.0     radvd License
-strace  4.5.20  strace License
-portmap     1.6     The Regents of the University of California.
-DHCPv6  1.2     WIDE Project License
+Component   Version     License
+BSOpen Source Components Included in the BFC/CXC Packages
+OpenSSH     4.0p1   BSD Style (OpenSSH) License
+eCos    2.0     eCos License
+Kerberos    V5 Rel 1.5.1    MIT License
+Mongoose Web Server     3.0     MIT License
+dygraphs    1.2     MIT License
+EXPAT   1.95.8  MIT License
+aRes DNS    1.1.0   MIT License
+NetSNMP     5.0.9   NetSNMP License
+OpenSSL     1.0.1k  OpenSSL License and the original SSLeay License
+MD5 Message-Digest Algorithm    N/A     RSA MD5 License
+Fast CRC32  N/A     Richard Black Fast CRC32 License
+SFL - The Standard Function Library     N/A     SFL iMatix License
+nameser.h   8.1     The Regents of the University of California
+regex   N/A     University of Toronto License
+STUN Client and Server Library  0.96    Vovida Software License 1.0
+KAME IPv6 Stack     N/A     WIDE Project License
+traceroute  N/A     WIDE Project License
+traceroute6     1.42    WIDE Project License
+TinyXML     N/A     zlib License
+List of Open Source Included in the Linux eRouter and Residential Gateway
+axis2/c     1.6.0   Apache License 2.0
+base64  0.00.00B    base64 License
+map (Yyatta ASAMAP)     3/14/2014   BEER-WARE License
+YUI Compressor  2.4.7   BSD License
+tcpdump     3.9     BSD License
+Dropbear sshd   0.46    Dropbear License
+gptfdisk    0.8.7   GPL
+ifenslave   1.1.0   GPL
+bridge-utils    1.2     GPLv2
+conntrack-tools Includes:libnetfilter,libnetflink   0.9.14  GPLv2
+dbus    1.4.14  GPLv2 or The Academic Free License version 2.1
+ebtables    2.0.10-4    GPLv2
+iproute2    iproute2-ss140804   GPLv2
+udhcp   0.9.6   GPLv2
+zebra   0.93    GPLv2
+binutils    2.23    GPLv2
+cortex  0.1     GPLv2
+sqlite3     8.6     GPLv2
+e2fsprogs   1.41.14     GPLv2
+mtdutils    1.0     GPLv2
+ethtool     3.15    GPLv2
+bash    3.2     GPLv2
+busybox     1.21.1  GPLv2
+eglibc  2.18    GPLv2
+Linux   3.14    GPLv2
+iptables    1.6.0   GPLv2e
+iperf   2.0.0   iperf License
+avahi   0.6.30  LGPLv2.1
+libdaemon   0.14    LGPLv2.1
+dnsmasq     1.8     LGPLv2
+procps  3.2.7   LGPLv2
+i2c-tools   3.1.1   LGPLv2
+wdmd    2.2     LGPLv2
+libxml2     N/A     MIT License
+jsonc   0.12    MIT License
+jquery  v1.10.2     MIT license
+jQuery Color Animations     v2.1.2  MIT license
+Sizzle CSS Selector Engine  v1.10.2     MIT License
+expat   2.0.1   MIT/X Consortium license
+Net SNMP    5.7.2   NetSNMP License
+nodejs  v0.10.12    Node's license
+openssl     1.0.1j  OpenSSL License and the original SSLeay license
+radvd   1.0     radvd License
+strace  4.5.20  strace License
+portmap     1.6     The Regents of the University of California.
+DHCPv6  1.2     WIDE Project License
 
 
 
 
-License     License Text
+License     License Text
diff --git a/_site/technical-notes/setup.py-uninstall.html b/_site/technical-notes/setup.py-uninstall.html index 5c87018..625f01e 100644 --- a/_site/technical-notes/setup.py-uninstall.html +++ b/_site/technical-notes/setup.py-uninstall.html @@ -30,14 +30,14 @@

Unix-like

Install over the existing installation with the same sources, recording installed files, then delete them.

-
sudo python setup.py install --record files.txt
+
sudo python setup.py install --record files.txt
 # inspect files.txt to make sure it looks ok. Then in bash:
 tr '\n' '\0' < files.txt | xargs -0 sudo rm -f --
 

 
Windows

 
 
Install on top of the existing installation with a windows installer, then add-remove programs to uninstall.

-
python setup.py bdist_wininst
+
python setup.py bdist_wininst
 dist/foo-1.0.win32.exe
 

 
Use other methods which fully support uninstall when available

diff --git a/about-me.html b/about-me.html
index d0b94ce..e4e8aa1 100644
--- a/about-me.html
+++ b/about-me.html
@@ -1,18 +1,31 @@
 
Contact Info

 
 
+
I created this website around 2016, then I got deeply involved in a
+my other things (activism, interests, responsibilities, relationships),
+and the website didn't seem to matter for any of that, so I didn't
+update it beyond some of the git repos. Now, April 2024, I've spent a
+few hours on it. I plan to post some coding / sysadmin live stream
+recordings.

+
+
 
Other online activities

 
diff --git a/favorite-things.html b/favorite-things.html
index 78af781..ad01133 100644
--- a/favorite-things.html
+++ b/favorite-things.html
@@ -69,11 +69,10 @@
 
News/Blogs

 
@@ -108,25 +107,14 @@
   
  • GNU: Why software patents are bad
    • 
   
  • I'm a Software Freedom Conservancy supporter
    • 
   
  • I'm an Electronic Freedom Foundation supporter
    • 
-  
  • I'm an Open Source Initiative member
    • 
+  
  • I'm an Open Source Initiative member, mostly in order to vote in their board elections. I strongly prefer free software and software freedom, some reasons are listed here
    • 
   
  • I donate to Creative Commons
    • 
   
  • Hyperbole and a Half
    • 
   
    • 
 
 
-  
    -# rms asked me to...
-#  __..   ,.  ..   ._..  ..  .  .___..  ..___
-# (__  \./ |\/||    | |\ ||_/     |  |__|[__
-# .__)  |  |  ||____|_| \||  \    |  |  |[___
-
-# ._..  ..___..___.__ .  ..___.___. |  |  |
-#  | |\ |  |  [__ [__)|\ |[__   |   |  |  |
-# _|_| \|  |  [___|  \| \|[___  |   *  *  *
-    
    
 
 
    You've come this far, here are some pictures of me.
    
 head shot
 
 
-
diff --git a/get-comments b/get-comments
index 541ce3c..36563b8 100755
--- a/get-comments
+++ b/get-comments
@@ -20,7 +20,7 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 cd "${BASH_SOURCE%/*}/proposed-comments"
 
 all=false
-shell="ssh $(chost iankelling.org)"
+shell="ssh iankelling.org"
 while [[ $1 ]]; do
     case $1 in
         -a) all=true; shift ;;
diff --git a/gitweb-descriptions b/gitweb-descriptions
index 58aecdb..f968028 100755
--- a/gitweb-descriptions
+++ b/gitweb-descriptions
@@ -22,7 +22,7 @@
 # else, parse the readme, find the first non blank, not starting with [#*],
 # and use that line.
 
-source /a/bin/errhandle/err
+set -e; . /usr/local/lib/bash-bear; set +e
 
 if [[ ! $1 ]]; then
   echo "need gitroot arg"
@@ -59,6 +59,12 @@ gitweb-descriptions() {
     if [[ ${personalized[${d##*/}]} ]]; then
       echo "$pcategory" >.git/category
     fi
+    if [[ ${unmaintained[${d##*/}]} ]]; then
+      echo "$ucategory" >.git/category
+    fi
+    if [[ ${historicalarchive[${d##*/}]} ]]; then
+      echo "$hcategory" >.git/category
+    fi
     f=(!(LICENSE|COPYING|README|.git))
     if [[ ${#f[@]} == 1 && ! -d $f ]]; then
       if [[ ! -x $f ]]; then
@@ -91,6 +97,25 @@ declare -A personalized
 for p in ${tmp[@]}; do personalized[$p]=true; done
 pcategory="Personalized for my use. Useful as examples or to copy specific parts"
 
+tmp=(
+  bbdb-csv-import
+  evhz
+  )
+ucategory="I don't use these anymore, they may or may not work, patches welcome"
+declare -A unmaintained
+for p in ${tmp[@]}; do unmaintained[$p]=true; done
+
+tmp=(
+  bash-template
+  debian-auto-update
+  fdroidcl-up
+  mediawiki-setup
+  mediawiki-librejs-patch
+  mediawiki-sidebar-patch
+)
+hcategory="Historical archive. They don't work or have been superseded."
+declare -A historicalarchive
+for p in ${tmp[@]}; do historicalarchive[$p]=true; done
 
 dirs=()
 for d in $gitroot/*; do
diff --git a/index.html b/index.html
index c30e7ed..c69288e 100644
--- a/index.html
+++ b/index.html
@@ -1,8 +1,29 @@
+
+
    2024-04: The text on this page is new!
    
+
+
    Free software is a under-appreciated cause.
    
+
+
    If you can, please donate to The Free Software Foundation and/or volunteer.
    
+
+
    I hope you can join me at LibrePlanet 2024 in Boston on May 4 & 5.
    
+
+
    I'm working on recruiting volunteer system administrators
+to have fun and help run services that are important for GNU,
+FSF and the free software movement, see
+https://libreplanet.org/wiki/Group:FSF:Tech_Team_Volunteers. Please join us!
    
+
+
    I talk about what I'm up to most every day in #fsfsys on
+libera.chat. I'm starting to do live streams of my work, and I'm going
+to post some to /stream-videos.
    
+
+
    Please help promote the term free software over the term open
+source. Open source, as defined by the Open Source Initiative (OSI),
+somewhat misses the point. I also know the FSF board members and I
+trust them.
    
+
+
 
diff --git a/set-comments b/set-comments
index c503aec..8cb7029 100755
--- a/set-comments
+++ b/set-comments
@@ -20,7 +20,7 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 cd "${BASH_SOURCE%/*}/proposed-comments"
 
 
-shell="ssh -oStrictHostKeyChecking=no $(chost iankelling.org)"
+shell="ssh -oStrictHostKeyChecking=no iankelling.org"
 while [[ $1 ]]; do
     case $1 in
         -l) shell= ; shift ;; # -l  for local
diff --git a/setup.sh b/setup.sh
index cd4dfaa..f081135 100755
--- a/setup.sh
+++ b/setup.sh
@@ -14,10 +14,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see .
 
-source /a/bin/errhandle/err
+set -e; . /usr/local/lib/bash-bear; set +e
 
 usage() {
-    cat </dev/null || $s apt-get -y install ffmpeg
 
 
 pkgs=(
-    # build.rb dependencies
-    ruby-pygments.rb ruby-safe-yaml ruby-sass
-    # python pkgs used for o(n^2) voting blog entry
-    python-bcrypt python-passlib
-    # gitweb pkgs
-    gitweb highlight
+  # build.rb dependencies
+  ruby-pygments.rb ruby-safe-yaml ruby-sass
+  # python pkgs used for o(n^2) voting blog entry
+  # # commented out, needs update to python3
+  #python-bcrypt python-passlib
+  # gitweb pkgs
+  gitweb highlight
 )
 if $deb8; then
-    pkgs+=(build-essential ruby-dev)
+  pkgs+=(build-essential ruby-dev)
 else
-    pkgs+=(ruby-redcarpet)
+  pkgs+=(ruby-redcarpet)
 fi
-
-$s apt-get -y install ${pkgs[@]}
+source /a/bin/distro-functions/src/package-manager-abstractions
+pi ${pkgs[@]}
 if $deb8; then
-    sudo gem install redcarpet
+  sudo gem install redcarpet
 fi
 chmod og+x _site/on2vote/vote.py
 
@@ -141,7 +144,7 @@ our \$home_text = "$script_dir/_site/gitweb_home.html";
 our \$projects_list_group_categories = 1;
 EOF
 
-web-conf $email_arg -p $port - apache2 $domain <
   # to run python scripts with cgi
@@ -149,6 +152,11 @@ web-conf $email_arg -p $port - apache2 $domain <
 
+
+  Options Indexes
+
+
+
 
   Options +ExecCGI
   SetHandler cgi-script